Merged UnaryOp and BinaryOp

core/src/mindustry/logic/LStatements.java

@@ -56,15 +56,23 @@ public class LStatements{
         }
     }
 
-    @RegisterStatement("getlink")
-    public static class GetLinkStatement extends LStatement{
-        public String output = "result", address = "0";
+    @RegisterStatement("read")
+    public static class ReadStatement extends LStatement{
+        public String output = "result", target = "cell1", address = "0";
 
         @Override
         public void build(Table table){
+            table.add(" read ");
+
             field(table, output, str -> output = str);
 
-            table.add(" = link# ");
+            table.add(" = ");
+
+            fields(table, target, str -> target = str);
+
+            row(table);
+
+            table.add(" at ");
 
             field(table, address, str -> address = str);
         }
@@ -76,7 +84,7 @@ public class LStatements{
 
         @Override
         public LInstruction build(LAssembler builder){
-            return new GetLinkI(builder.var(output), builder.var(address));
+            return new ReadI(builder.var(target), builder.var(address), builder.var(output));
         }
     }
 
@@ -112,38 +120,6 @@ public class LStatements{
         }
     }
 
-    @RegisterStatement("read")
-    public static class ReadStatement extends LStatement{
-        public String output = "result", target = "cell1", address = "0";
-
-        @Override
-        public void build(Table table){
-            table.add(" read ");
-
-            field(table, output, str -> output = str);
-
-            table.add(" = ");
-
-            fields(table, target, str -> target = str);
-
-            row(table);
-
-            table.add(" at ");
-
-            field(table, address, str -> address = str);
-        }
-
-        @Override
-        public LCategory category(){
-            return LCategory.io;
-        }
-
-        @Override
-        public LInstruction build(LAssembler builder){
-            return new ReadI(builder.var(target), builder.var(address), builder.var(output));
-        }
-    }
-
     @RegisterStatement("draw")
     public static class DrawStatement extends LStatement{
         public GraphicsType type = GraphicsType.clear;
@@ -253,6 +229,26 @@ public class LStatements{
         }
     }
 
+    @RegisterStatement("print")
+    public static class PrintStatement extends LStatement{
+        public String value = "\"frog\"";
+
+        @Override
+        public void build(Table table){
+            field(table, value, str -> value = str).width(0f).growX().padRight(3);
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new PrintI(builder.var(value));
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.io;
+        }
+    }
+
     @RegisterStatement("drawflush")
     public static class DrawFlushStatement extends LStatement{
         public String target = "display1";
@@ -274,26 +270,6 @@ public class LStatements{
         }
     }
 
-    @RegisterStatement("print")
-    public static class PrintStatement extends LStatement{
-        public String value = "\"frog\"";
-
-        @Override
-        public void build(Table table){
-            field(table, value, str -> value = str).width(0f).growX().padRight(3);
-        }
-
-        @Override
-        public LInstruction build(LAssembler builder){
-            return new PrintI(builder.var(value));
-        }
-
-        @Override
-        public LCategory category(){
-            return LCategory.control;
-        }
-    }
-
     @RegisterStatement("printflush")
     public static class PrintFlushStatement extends LStatement{
         public String target = "message1";
@@ -315,6 +291,30 @@ public class LStatements{
         }
     }
 
+    @RegisterStatement("getlink")
+    public static class GetLinkStatement extends LStatement{
+        public String output = "result", address = "0";
+
+        @Override
+        public void build(Table table){
+            field(table, output, str -> output = str);
+
+            table.add(" = link# ");
+
+            field(table, address, str -> address = str);
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.blocks;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new GetLinkI(builder.var(output), builder.var(address));
+        }
+    }
+
     @RegisterStatement("control")
     public static class ControlStatement extends LStatement{
         public LAccess type = LAccess.enabled;
@@ -561,62 +561,51 @@ public class LStatements{
         }
     }
 
-    @RegisterStatement("bop")
-    public static class BinaryOpStatement extends LStatement{
-        public BinaryOp op = BinaryOp.add;
-        public String a = "a", b = "b", dest = "result";
+    @RegisterStatement("op")
+    public static class OperationStatement extends LStatement{
+        public LogicOp op = LogicOp.add;
+        public String dest = "result", a = "a", b = "b";
 
         @Override
         public void build(Table table){
+            rebuild(table);
+        }
+
+        void rebuild(Table table){
+            table.clearChildren();
+
             field(table, dest, str -> dest = str);
 
             table.add(" = ");
 
-            row(table);
+            if(op.unary){
+                opButton(table);
 
-            field(table, a, str -> a = str);
+                field(table, a, str -> a = str);
+            }else{
+                row(table);
 
+                field(table, a, str -> a = str);
+
+                opButton(table);
+
+                field(table, b, str -> b = str);
+            }
+        }
+
+        void opButton(Table table){
             table.button(b -> {
                 b.label(() -> op.symbol);
-                b.clicked(() -> showSelect(b, BinaryOp.all, op, o -> op = o));
+                b.clicked(() -> showSelect(b, LogicOp.all, op, o -> {
+                    op = o;
+                    rebuild(table);
+                }));
             }, Styles.logict, () -> {}).size(60f, 40f).pad(4f).color(table.color);
-
-            field(table, b, str -> b = str);
         }
 
         @Override
         public LInstruction build(LAssembler builder){
-            return new BinaryOpI(op,builder.var(a), builder.var(b), builder.var(dest));
-        }
-
-        @Override
-        public LCategory category(){
-            return LCategory.operations;
-        }
-    }
-
-    @RegisterStatement("uop")
-    public static class UnaryOpStatement extends LStatement{
-        public UnaryOp op = UnaryOp.negate;
-        public String value = "b", dest = "result";
-
-        @Override
-        public void build(Table table){
-            field(table, dest, str -> dest = str);
-
-            table.add(" = ");
-
-            table.button(b -> {
-                b.label(() -> op.symbol);
-                b.clicked(() -> showSelect(b, UnaryOp.all, op, o -> op = o));
-            }, Styles.logict, () -> {}).size(50f, 40f).pad(3f).color(table.color);
-
-            field(table, value, str -> value = str);
-        }
-
-        @Override
-        public LInstruction build(LAssembler builder){
-            return new UnaryOpI(op, builder.var(value), builder.var(dest));
+            return new OpI(op,builder.var(a), builder.var(b), builder.var(dest));
         }
 
         @Override