Finished all blocks except vars and cleanup

src/main/java/com/ardublock/translator/block/control/ElseBlock.java

@@ -10,8 +10,6 @@ import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 
 import tec.letsgoing.ardublock.simulator.simcode.SimCode;
 import tec.letsgoing.ardublock.simulator.simcode.control.CodeElse;
-import tec.letsgoing.ardublock.simulator.simcode.control.CodeElseIf;
-import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
 import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeIf;
 
 public class ElseBlock extends TranslatorBlock

src/main/java/com/ardublock/translator/block/control/ElseIfBlock.java

@@ -10,7 +10,6 @@ import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 
 import tec.letsgoing.ardublock.simulator.simcode.SimCode;
 import tec.letsgoing.ardublock.simulator.simcode.control.CodeElseIf;
-import tec.letsgoing.ardublock.simulator.simcode.control.CodeIf;
 import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
 import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeIf;
 

src/main/java/com/ardublock/translator/block/control/IfBlock.java

@@ -9,8 +9,6 @@ import com.ardublock.translator.block.exception.SocketNullException;
 import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 
 import tec.letsgoing.ardublock.simulator.simcode.SimCode;
-import tec.letsgoing.ardublock.simulator.simcode.control.CodeElse;
-import tec.letsgoing.ardublock.simulator.simcode.control.CodeElseIf;
 import tec.letsgoing.ardublock.simulator.simcode.control.CodeIf;
 import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
 import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeIf;

src/main/java/com/ardublock/translator/block/control/LoopBlock.java

@@ -10,11 +10,8 @@ import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 
 import tec.letsgoing.ardublock.simulator.Simulator;
 import tec.letsgoing.ardublock.simulator.simcode.SimCode;
-import tec.letsgoing.ardublock.simulator.simcode.control.CodeElse;
-import tec.letsgoing.ardublock.simulator.simcode.control.CodeElseIf;
 import tec.letsgoing.ardublock.simulator.simcode.control.CodeWhile;
 import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
-import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeIf;
 import tec.letsgoing.ardublock.simulator.simcode.functions.CodeExecuteFunction;
 import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
 

src/main/java/com/ardublock/translator/block/control/ProgramBlock.java

@@ -2,20 +2,12 @@ package com.ardublock.translator.block.control;
 
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Vector;
 
 import com.ardublock.translator.Translator;
 import com.ardublock.translator.block.TranslatorBlock;
-import com.ardublock.translator.block.exception.BlockException;
 import com.ardublock.translator.block.exception.SocketNullException;
 import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 
-import tec.letsgoing.ardublock.simulator.Simulator;
-import tec.letsgoing.ardublock.simulator.simcode.SimCode;
-import tec.letsgoing.ardublock.simulator.simcode.control.CodeWhile;
-import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
-import tec.letsgoing.ardublock.simulator.simcode.functions.CodeExecuteFunction;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
 
 
 public class ProgramBlock extends TranslatorBlock

src/main/java/com/ardublock/translator/block/control/RepeatBlock.java

@@ -13,9 +13,7 @@ import com.ardublock.translator.block.numbers.NumberBlock;
 import com.ardublock.translator.block.numbers.VariableNumberBlock;
 
 import tec.letsgoing.ardublock.simulator.simcode.SimCode;
-import tec.letsgoing.ardublock.simulator.simcode.control.CodeFor;
 import tec.letsgoing.ardublock.simulator.simcode.control.CodeForCount;
-import tec.letsgoing.ardublock.simulator.simcode.control.CodeWhile;
 import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
 import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeString;
 

src/main/java/com/ardublock/translator/block/control/SubroutineBlock.java

@@ -10,10 +10,6 @@ import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 
 import tec.letsgoing.ardublock.simulator.Simulator;
 import tec.letsgoing.ardublock.simulator.simcode.SimCode;
-import tec.letsgoing.ardublock.simulator.simcode.control.CodeWhile;
-import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
-import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeString;
-import tec.letsgoing.ardublock.simulator.simcode.functions.CodeExecuteFunction;
 import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
 
 public class SubroutineBlock extends TranslatorBlock

src/main/java/com/ardublock/translator/block/control/WaitBlock.java

@@ -13,7 +13,6 @@ import com.ardublock.translator.block.numbers.NumberBlock;
 import com.ardublock.translator.block.numbers.VariableNumberBlock;
 
 import tec.letsgoing.ardublock.simulator.simcode.SimCode;
-import tec.letsgoing.ardublock.simulator.simcode.control.CodeForCount;
 import tec.letsgoing.ardublock.simulator.simcode.control.CodeWhileMillis;
 import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
 import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeString;

src/main/java/com/ardublock/translator/block/input/AnalogInputBlock.java

@@ -9,7 +9,6 @@ import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 import tec.letsgoing.ardublock.simulator.simcode.SimCode;
 import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
 import tec.letsgoing.ardublock.simulator.simcode.io.CodeAnalogRead;
-import tec.letsgoing.ardublock.simulator.simcode.io.CodeAnalogWrite;
 
 public class AnalogInputBlock extends TranslatorBlock
 {

src/main/java/com/ardublock/translator/block/input/DigitalInputBlock.java

@@ -10,7 +10,6 @@ import com.ardublock.translator.block.numbers.VariableNumberBlock;
 
 import tec.letsgoing.ardublock.simulator.simcode.SimCode;
 import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
-import tec.letsgoing.ardublock.simulator.simcode.io.CodeAnalogRead;
 import tec.letsgoing.ardublock.simulator.simcode.io.CodeDigitalRead;
 
 public class DigitalInputBlock extends TranslatorBlock

src/main/java/com/ardublock/translator/block/logic/AndBlock.java

@@ -5,6 +5,10 @@ import com.ardublock.translator.block.TranslatorBlock;
 import com.ardublock.translator.block.exception.SocketNullException;
 import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 
+import tec.letsgoing.ardublock.simulator.simcode.SimCode;
+import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
+import tec.letsgoing.ardublock.simulator.simcode.logic.CodeAND;
+
 public class AndBlock extends TranslatorBlock
 {
 	public AndBlock(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
@@ -25,4 +29,10 @@ public class AndBlock extends TranslatorBlock
 		return codePrefix + ret + codeSuffix;
 	}
 	
+	public SimCode toSim() throws SocketNullException {
+		TranslatorBlock b1 = this.getRequiredTranslatorBlockAtSocket(0);
+		TranslatorBlock b2 = this.getRequiredTranslatorBlockAtSocket(1);
+		return new CodeAND((SimTypeBool)b1.toSim(),(SimTypeBool)b2.toSim());
+	}
+
 }

src/main/java/com/ardublock/translator/block/logic/EqualBlock.java

@@ -5,6 +5,10 @@ import com.ardublock.translator.block.TranslatorBlock;
 import com.ardublock.translator.block.exception.SocketNullException;
 import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 
+import tec.letsgoing.ardublock.simulator.simcode.SimCode;
+import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
+import tec.letsgoing.ardublock.simulator.simcode.logic.CodeIntEqual;
+
 public class EqualBlock extends TranslatorBlock
 {
 	public EqualBlock(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
@@ -24,4 +28,10 @@ public class EqualBlock extends TranslatorBlock
 		ret = ret + " )";
 		return codePrefix + ret + codeSuffix;
 	}
+	
+	public SimCode toSim() throws SocketNullException {
+		TranslatorBlock b1 = this.getRequiredTranslatorBlockAtSocket(0);
+		TranslatorBlock b2 = this.getRequiredTranslatorBlockAtSocket(1);
+		return new CodeIntEqual((SimTypeInt)b1.toSim(),(SimTypeInt)b2.toSim());
+	}
 }

src/main/java/com/ardublock/translator/block/logic/EqualDigitalBlock.java

@@ -5,6 +5,10 @@ import com.ardublock.translator.block.TranslatorBlock;
 import com.ardublock.translator.block.exception.SocketNullException;
 import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 
+import tec.letsgoing.ardublock.simulator.simcode.SimCode;
+import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
+import tec.letsgoing.ardublock.simulator.simcode.logic.CodeBoolEqual;
+
 public class EqualDigitalBlock extends TranslatorBlock
 {
 	public EqualDigitalBlock(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
@@ -24,4 +28,10 @@ public class EqualDigitalBlock extends TranslatorBlock
 		ret = ret + " )";
 		return codePrefix + ret + codeSuffix;
 	}
+	
+	public SimCode toSim() throws SocketNullException {
+		TranslatorBlock b1 = this.getRequiredTranslatorBlockAtSocket(0);
+		TranslatorBlock b2 = this.getRequiredTranslatorBlockAtSocket(1);
+		return new CodeBoolEqual((SimTypeBool)b1.toSim(),(SimTypeBool)b2.toSim());
+	}
 }

src/main/java/com/ardublock/translator/block/logic/GreaterBlock.java

@@ -5,6 +5,10 @@ import com.ardublock.translator.block.TranslatorBlock;
 import com.ardublock.translator.block.exception.SocketNullException;
 import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 
+import tec.letsgoing.ardublock.simulator.simcode.SimCode;
+import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
+import tec.letsgoing.ardublock.simulator.simcode.logic.CodeIntBigger;
+
 public class GreaterBlock extends TranslatorBlock
 {
 	public GreaterBlock(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
@@ -24,4 +28,9 @@ public class GreaterBlock extends TranslatorBlock
 		ret = ret + " )";
 		return codePrefix + ret + codeSuffix;
 	}
+	public SimCode toSim() throws SocketNullException {
+		TranslatorBlock b1 = this.getRequiredTranslatorBlockAtSocket(0);
+		TranslatorBlock b2 = this.getRequiredTranslatorBlockAtSocket(1);
+		return new CodeIntBigger((SimTypeInt)b1.toSim(),(SimTypeInt)b2.toSim());
+	}
 }

src/main/java/com/ardublock/translator/block/logic/GreaterEqualBlock.java

@@ -5,6 +5,10 @@ import com.ardublock.translator.block.TranslatorBlock;
 import com.ardublock.translator.block.exception.SocketNullException;
 import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 
+import tec.letsgoing.ardublock.simulator.simcode.SimCode;
+import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
+import tec.letsgoing.ardublock.simulator.simcode.logic.CodeIntBiggerEqual;
+
 public class GreaterEqualBlock extends TranslatorBlock
 {
 	public GreaterEqualBlock(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
@@ -24,4 +28,9 @@ public class GreaterEqualBlock extends TranslatorBlock
 		ret = ret + " )";
 		return codePrefix + ret + codeSuffix;
 	}
+	public SimCode toSim() throws SocketNullException {
+		TranslatorBlock b1 = this.getRequiredTranslatorBlockAtSocket(0);
+		TranslatorBlock b2 = this.getRequiredTranslatorBlockAtSocket(1);
+		return new CodeIntBiggerEqual((SimTypeInt)b1.toSim(),(SimTypeInt)b2.toSim());
+	}
 }

src/main/java/com/ardublock/translator/block/logic/LessBlock.java

@@ -5,6 +5,10 @@ import com.ardublock.translator.block.TranslatorBlock;
 import com.ardublock.translator.block.exception.SocketNullException;
 import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 
+import tec.letsgoing.ardublock.simulator.simcode.SimCode;
+import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
+import tec.letsgoing.ardublock.simulator.simcode.logic.CodeIntSmaller;
+
 public class LessBlock extends TranslatorBlock
 {
 	public LessBlock(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
@@ -24,4 +28,10 @@ public class LessBlock extends TranslatorBlock
 		ret = ret + " )";
 		return codePrefix + ret + codeSuffix;
 	}
+	
+	public SimCode toSim() throws SocketNullException {
+		TranslatorBlock b1 = this.getRequiredTranslatorBlockAtSocket(0);
+		TranslatorBlock b2 = this.getRequiredTranslatorBlockAtSocket(1);
+		return new CodeIntSmaller((SimTypeInt)b1.toSim(),(SimTypeInt)b2.toSim());
+	}
 }

src/main/java/com/ardublock/translator/block/logic/LessEqualBlock.java

@@ -5,6 +5,10 @@ import com.ardublock.translator.block.TranslatorBlock;
 import com.ardublock.translator.block.exception.SocketNullException;
 import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 
+import tec.letsgoing.ardublock.simulator.simcode.SimCode;
+import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
+import tec.letsgoing.ardublock.simulator.simcode.logic.CodeIntSmallerEqual;
+
 public class LessEqualBlock extends TranslatorBlock
 {
 	public LessEqualBlock(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
@@ -24,4 +28,9 @@ public class LessEqualBlock extends TranslatorBlock
 		ret = ret + " )";
 		return codePrefix + ret + codeSuffix;
 	}
+	public SimCode toSim() throws SocketNullException {
+		TranslatorBlock b1 = this.getRequiredTranslatorBlockAtSocket(0);
+		TranslatorBlock b2 = this.getRequiredTranslatorBlockAtSocket(1);
+		return new CodeIntSmallerEqual((SimTypeInt)b1.toSim(),(SimTypeInt)b2.toSim());
+	}
 }

src/main/java/com/ardublock/translator/block/logic/NotBlock.java

@@ -5,6 +5,10 @@ import com.ardublock.translator.block.TranslatorBlock;
 import com.ardublock.translator.block.exception.SocketNullException;
 import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 
+import tec.letsgoing.ardublock.simulator.simcode.SimCode;
+import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
+import tec.letsgoing.ardublock.simulator.simcode.logic.CodeNOT;
+
 public class NotBlock extends TranslatorBlock
 {
 	public NotBlock(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
@@ -21,5 +25,9 @@ public class NotBlock extends TranslatorBlock
 		ret = ret + " )";
 		return codePrefix + ret + codeSuffix;
 	}
+	public SimCode toSim() throws SocketNullException {
+		TranslatorBlock b = this.getRequiredTranslatorBlockAtSocket(0);
+		return new CodeNOT((SimTypeBool)b.toSim());
+	}
 
 }

src/main/java/com/ardublock/translator/block/logic/NotEqualBlock.java

@@ -5,6 +5,10 @@ import com.ardublock.translator.block.TranslatorBlock;
 import com.ardublock.translator.block.exception.SocketNullException;
 import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 
+import tec.letsgoing.ardublock.simulator.simcode.SimCode;
+import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
+import tec.letsgoing.ardublock.simulator.simcode.logic.CodeIntUnequal;
+
 public class NotEqualBlock extends TranslatorBlock
 {
 	public NotEqualBlock(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
@@ -24,4 +28,10 @@ public class NotEqualBlock extends TranslatorBlock
 		ret = ret + " )";
 		return codePrefix + ret + codeSuffix;
 	}
+	
+	public SimCode toSim() throws SocketNullException {
+		TranslatorBlock b1 = this.getRequiredTranslatorBlockAtSocket(0);
+		TranslatorBlock b2 = this.getRequiredTranslatorBlockAtSocket(1);
+		return new CodeIntUnequal((SimTypeInt)b1.toSim(),(SimTypeInt)b2.toSim());
+	}
 }

src/main/java/com/ardublock/translator/block/logic/NotEqualDigitalBlock.java

@@ -5,6 +5,10 @@ import com.ardublock.translator.block.TranslatorBlock;
 import com.ardublock.translator.block.exception.SocketNullException;
 import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 
+import tec.letsgoing.ardublock.simulator.simcode.SimCode;
+import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
+import tec.letsgoing.ardublock.simulator.simcode.logic.CodeBoolUnequal;
+
 public class NotEqualDigitalBlock extends TranslatorBlock
 {
 	public NotEqualDigitalBlock(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
@@ -24,4 +28,10 @@ public class NotEqualDigitalBlock extends TranslatorBlock
 		ret = ret + " )";
 		return codePrefix + ret + codeSuffix;
 	}
+	
+	public SimCode toSim() throws SocketNullException {
+		TranslatorBlock b1 = this.getRequiredTranslatorBlockAtSocket(0);
+		TranslatorBlock b2 = this.getRequiredTranslatorBlockAtSocket(1);
+		return new CodeBoolUnequal((SimTypeBool)b1.toSim(),(SimTypeBool)b2.toSim());
+	}
 }