Moved type inference into the model. Renamed ICL to model.

src/main/java/dk/camelot64/kickc/Compiler.java

@@ -1,6 +1,6 @@
 package dk.camelot64.kickc;
 
-import dk.camelot64.kickc.icl.*;
+import dk.camelot64.kickc.model.*;
 import dk.camelot64.kickc.parser.KickCLexer;
 import dk.camelot64.kickc.parser.KickCParser;
 import dk.camelot64.kickc.passes.*;

src/main/java/dk/camelot64/kickc/fragment/AsmFragment.java

@@ -4,8 +4,7 @@ import dk.camelot64.kickc.NumberParser;
 import dk.camelot64.kickc.asm.*;
 import dk.camelot64.kickc.asm.parser.Asm6502BaseVisitor;
 import dk.camelot64.kickc.asm.parser.Asm6502Parser;
-import dk.camelot64.kickc.icl.*;
-import dk.camelot64.kickc.passes.Pass1TypeInference;
+import dk.camelot64.kickc.model.*;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -376,7 +375,7 @@ public class AsmFragment {
             return name;
          }
       } else if(value instanceof ConstantValue) {
-         SymbolType type = Pass1TypeInference.inferType(program.getScope(), (ConstantValue) value);
+         SymbolType type = SymbolTypeInference.inferType(program.getScope(), (ConstantValue) value);
          if (SymbolTypeBasic.BYTE.equals(type)) {
             String name = "coby" + nextConstByteIdx++;
             bindings.put(name, value);

src/main/java/dk/camelot64/kickc/model/CallGraph.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import java.util.ArrayList;
 import java.util.Collection;

src/main/java/dk/camelot64/kickc/model/CompileError.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 /**  Signals some error in the code (or compilation) */
 public class CompileError extends RuntimeException {

src/main/java/dk/camelot64/kickc/model/Constant.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 /** SSA form constant value */
 public interface Constant extends RValue {

src/main/java/dk/camelot64/kickc/model/ConstantBinary.java

@@ -1,6 +1,4 @@
-package dk.camelot64.kickc.icl;
-
-import dk.camelot64.kickc.passes.Pass1TypeInference;
+package dk.camelot64.kickc.model;
 
 /** A constant defined by a binary operator applied to two constants */
 public class ConstantBinary implements ConstantValue {
@@ -34,7 +32,7 @@ public class ConstantBinary implements ConstantValue {
 
    @Override
    public SymbolType getType(ProgramScope scope) {
-      return Pass1TypeInference.inferType(left.getType(scope), operator, right.getType(scope));
+      return SymbolTypeInference.inferType(left.getType(scope), operator, right.getType(scope));
    }
 
    @Override

src/main/java/dk/camelot64/kickc/model/ConstantBool.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 /**
  * SSA form constant integer value

src/main/java/dk/camelot64/kickc/model/ConstantDouble.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 /**
  * SSA form constant integer value

src/main/java/dk/camelot64/kickc/model/ConstantInteger.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;

src/main/java/dk/camelot64/kickc/model/ConstantRef.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

src/main/java/dk/camelot64/kickc/model/ConstantString.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 /**
  * SSA form constant integer value

src/main/java/dk/camelot64/kickc/model/ConstantUnary.java

@@ -1,6 +1,4 @@
-package dk.camelot64.kickc.icl;
-
-import dk.camelot64.kickc.passes.Pass1TypeInference;
+package dk.camelot64.kickc.model;
 
 /** A constant defined by a unary operator appied to another constant */
 public class ConstantUnary implements ConstantValue {
@@ -26,7 +24,7 @@ public class ConstantUnary implements ConstantValue {
 
    @Override
    public SymbolType getType(ProgramScope scope) {
-      return Pass1TypeInference.inferType(operator, operand.getType(scope));
+      return SymbolTypeInference.inferType(operator, operand.getType(scope));
    }
 
    @Override

src/main/java/dk/camelot64/kickc/model/ConstantValue.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 /** A constant value. The value might be calculated through a constant expression. */
 public interface ConstantValue extends Constant {

src/main/java/dk/camelot64/kickc/model/ConstantVar.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 

src/main/java/dk/camelot64/kickc/model/ControlFlowBlock.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;

src/main/java/dk/camelot64/kickc/model/ControlFlowGraph.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;

src/main/java/dk/camelot64/kickc/model/ControlFlowGraphBaseVisitor.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import java.util.Collection;
 

src/main/java/dk/camelot64/kickc/model/ControlFlowGraphCopyVisitor.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import java.util.LinkedHashMap;
 import java.util.List;

src/main/java/dk/camelot64/kickc/model/DominatorsBlock.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import java.util.Collection;
 import java.util.HashSet;

src/main/java/dk/camelot64/kickc/model/DominatorsGraph.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

src/main/java/dk/camelot64/kickc/model/LValue.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 /** Assignable value (capable of being on the left part of an assignment)*/
 public interface LValue extends RValue {

src/main/java/dk/camelot64/kickc/model/Label.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;

src/main/java/dk/camelot64/kickc/model/LabelRef.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

src/main/java/dk/camelot64/kickc/model/LiveRange.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/dk/camelot64/kickc/model/LiveRangeEquivalenceClass.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/dk/camelot64/kickc/model/LiveRangeEquivalenceClassSet.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/dk/camelot64/kickc/model/LiveRangeVariables.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import java.util.*;
 

src/main/java/dk/camelot64/kickc/model/LiveRangeVariablesEffective.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import java.util.*;
 

src/main/java/dk/camelot64/kickc/model/NaturalLoop.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import java.util.LinkedHashSet;
 import java.util.Set;

src/main/java/dk/camelot64/kickc/model/NaturalLoopSet.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import java.util.*;
 

src/main/java/dk/camelot64/kickc/model/Operator.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 /** An Operator. The operation performed on the rvalues in a Statement. */
 public class Operator {

src/main/java/dk/camelot64/kickc/model/PointerDereference.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 /** A dereferenced pointer */
 public interface PointerDereference extends LValue {

src/main/java/dk/camelot64/kickc/model/PointerDereferenceIndexed.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 /** A dereferenced variable pointer plus an index (used for array writes)*/
 public class PointerDereferenceIndexed implements PointerDereference {

src/main/java/dk/camelot64/kickc/model/PointerDereferenceSimple.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 /** A dereferenced pointer (based on a variable or a constant pointer)*/
 public class PointerDereferenceSimple implements PointerDereference {

src/main/java/dk/camelot64/kickc/model/Procedure.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;

src/main/java/dk/camelot64/kickc/model/ProcedureModifiedVars.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import java.util.*;
 

src/main/java/dk/camelot64/kickc/model/ProcedureRef.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;

src/main/java/dk/camelot64/kickc/model/Program.java

@@ -1,10 +1,9 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import dk.camelot64.kickc.CompileLog;
 import dk.camelot64.kickc.asm.AsmProgram;
-import dk.camelot64.kickc.passes.Pass1ModifiedVarsAnalysis;
 
 /** A KickC Intermediate Compiler Language (ICL) Program */
 public class Program {

src/main/java/dk/camelot64/kickc/model/ProgramScope.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;

src/main/java/dk/camelot64/kickc/model/RValue.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 /** A value usable as part of a calculation (ib the right side of an assignment)*/
 public interface RValue extends Value {

src/main/java/dk/camelot64/kickc/model/RegisterCombination.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

src/main/java/dk/camelot64/kickc/model/RegisterCombinationIterator.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import java.util.Iterator;
 import java.util.List;

src/main/java/dk/camelot64/kickc/model/RegisterPotentials.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import java.util.*;
 

src/main/java/dk/camelot64/kickc/model/RegisterUpliftProgram.java

@@ -1,7 +1,6 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 /**

src/main/java/dk/camelot64/kickc/model/RegisterUpliftScope.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.ibm.icu.text.NumberFormat;
 

src/main/java/dk/camelot64/kickc/model/Registers.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 /** The different registers available for a program  */
 public class Registers {

src/main/java/dk/camelot64/kickc/model/Scope.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;

src/main/java/dk/camelot64/kickc/model/ScopeRef.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

src/main/java/dk/camelot64/kickc/model/Statement.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;

src/main/java/dk/camelot64/kickc/model/StatementAssignment.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

src/main/java/dk/camelot64/kickc/model/StatementBase.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import java.util.List;
 

src/main/java/dk/camelot64/kickc/model/StatementCall.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;

src/main/java/dk/camelot64/kickc/model/StatementConditionalJump.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

src/main/java/dk/camelot64/kickc/model/StatementJump.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 /**
  * Single Static Assignment Form Statement unconditional jump.

src/main/java/dk/camelot64/kickc/model/StatementLValue.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 /**
  * Single Static Assignment Form Statement with an LValuie - that is a statement assigning a value to a variable.

src/main/java/dk/camelot64/kickc/model/StatementLabel.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 /**
  * Single Static Assignment Form Statement Jump target.

src/main/java/dk/camelot64/kickc/model/StatementPhiBlock.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;

src/main/java/dk/camelot64/kickc/model/StatementProcedureBegin.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 /** Procedure declaration in SSA */
 public class StatementProcedureBegin extends StatementBase {

src/main/java/dk/camelot64/kickc/model/StatementProcedureEnd.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 /**
  * Procedure declaration in SSA

src/main/java/dk/camelot64/kickc/model/StatementReturn.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

src/main/java/dk/camelot64/kickc/model/StatementSequence.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/dk/camelot64/kickc/model/Symbol.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 

src/main/java/dk/camelot64/kickc/model/SymbolRef.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 

src/main/java/dk/camelot64/kickc/model/SymbolType.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;

src/main/java/dk/camelot64/kickc/model/SymbolTypeArray.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

src/main/java/dk/camelot64/kickc/model/SymbolTypeBasic.java

@@ -1,7 +1,6 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /** Basic Symbol Types */

src/main/java/dk/camelot64/kickc/model/SymbolTypeInference.java

@@ -0,0 +1,124 @@
+package dk.camelot64.kickc.model;
+
+/** Type inference of expressions (rValues & unary/binary operators) */
+public class SymbolTypeInference {
+
+   public static SymbolType inferType(Operator operator, SymbolType subType) {
+      if(operator==null) {
+         return subType;
+      }
+      String op = operator.getOperator();
+      switch (op) {
+         case "*":
+            if(subType instanceof SymbolTypePointer) {
+               return ((SymbolTypePointer) subType).getElementType();
+            } else {
+               throw new RuntimeException("Type error: Dereferencing a non-pointer "+subType);
+            }
+         default:
+            return subType;
+      }
+   }
+
+   public static SymbolType inferType(SymbolType type1, Operator operator, SymbolType type2) {
+      String op = operator.getOperator();
+      switch (op) {
+         case "==":
+         case "<":
+         case "<=":
+         case "=<":
+         case ">":
+         case ">=":
+         case "=>":
+         case "<>":
+         case "!=":
+         case "&&":
+         case "||":
+         case "and":
+         case "or":
+            return SymbolTypeBasic.BOOLEAN;
+         case "+":
+         case "-":
+            if (type1 instanceof SymbolTypePointer && (type2.equals(SymbolTypeBasic.BYTE) || type2.equals(SymbolTypeBasic.WORD))) {
+               return new SymbolTypePointer(((SymbolTypePointer) type1).getElementType());
+            }
+            if (type1 instanceof SymbolTypePointer && type2 instanceof SymbolTypePointer) {
+               SymbolType elmType1 = ((SymbolTypePointer) type1).getElementType();
+               SymbolType elmType2 = ((SymbolTypePointer) type2).getElementType();
+               return inferType(elmType1, operator, elmType2);
+            }
+            if (SymbolTypeBasic.WORD.equals(type1) || SymbolTypeBasic.WORD.equals(type2)) {
+               return SymbolTypeBasic.WORD;
+            } else if (SymbolTypeBasic.BYTE.equals(type1) && SymbolTypeBasic.BYTE.equals(type2)) {
+               return SymbolTypeBasic.BYTE;
+            }
+            throw new RuntimeException("Type inference case not handled " + type1 + " " + operator + " " + type2);
+         case "*":
+            if(type1==null && type2 instanceof SymbolTypePointer) {
+               return ((SymbolTypePointer) type2).getElementType();
+            }
+            if (SymbolTypeBasic.WORD.equals(type1) || SymbolTypeBasic.WORD.equals(type2)) {
+               return SymbolTypeBasic.WORD;
+            } else if (SymbolTypeBasic.BYTE.equals(type1) && SymbolTypeBasic.BYTE.equals(type2)) {
+               return SymbolTypeBasic.BYTE;
+            }
+            throw new RuntimeException("Type inference case not handled " + type1 + " " + operator + " " + type2);
+         case "*idx":
+            if(type1 instanceof SymbolTypePointer) {
+               return ((SymbolTypePointer) type1).getElementType();
+            }
+            throw new RuntimeException("Type inference case not handled " + type1 + " " + operator + " " + type2);
+         case "/":
+            if (SymbolTypeBasic.WORD.equals(type1) || SymbolTypeBasic.WORD.equals(type2)) {
+               return SymbolTypeBasic.WORD;
+            } else if (SymbolTypeBasic.BYTE.equals(type1) && SymbolTypeBasic.BYTE.equals(type2)) {
+               return SymbolTypeBasic.BYTE;
+            }
+            throw new RuntimeException("Type inference case not handled " + type1 + " " + operator + " " + type2);
+         case "<<":
+         case ">>":
+            if (SymbolTypeBasic.WORD.equals(type1)) {
+               return SymbolTypeBasic.WORD;
+            } else if (SymbolTypeBasic.BYTE.equals(type1)) {
+               return SymbolTypeBasic.BYTE;
+            }
+            throw new RuntimeException("Type inference case not handled " + type1 + " " + operator + " " + type2);
+         default:
+            throw new RuntimeException("Type inference case not handled " + type1 + " " + operator + " " + type2);
+      }
+   }
+
+   public static SymbolType inferType(ProgramScope programScope, RValue rValue) {
+      SymbolType type = null;
+      if (rValue instanceof VariableRef) {
+         Variable variable = programScope.getVariable((VariableRef) rValue);
+         type = variable.getType();
+      } else if (rValue instanceof ConstantRef) {
+         ConstantVar constVar = programScope.getConstant((ConstantRef) rValue);
+         type = constVar.getType();
+      } else if (rValue instanceof Symbol) {
+         Symbol rSymbol = (Symbol) rValue;
+         type = rSymbol.getType();
+      } else if (rValue instanceof ConstantInteger) {
+         ConstantInteger rInt = (ConstantInteger) rValue;
+         return rInt.getType(programScope);
+      } else if (rValue instanceof ConstantString) {
+         type = SymbolTypeBasic.STRING;
+      } else if (rValue instanceof ConstantBool) {
+         type = SymbolTypeBasic.BOOLEAN;
+      } else if (rValue instanceof ConstantUnary) {
+         ConstantUnary constUnary = (ConstantUnary) rValue;
+         SymbolType subType = inferType(programScope, constUnary.getOperand());
+         return inferType(constUnary.getOperator(), subType);
+      } else if (rValue instanceof ConstantBinary) {
+         ConstantBinary constBin = (ConstantBinary) rValue;
+         SymbolType leftType = inferType(programScope, constBin.getLeft());
+         SymbolType rightType = inferType(programScope, constBin.getRight());
+         return inferType(leftType, constBin.getOperator(), rightType);
+      }
+      if (type == null) {
+         throw new RuntimeException("Cannot infer type for " + rValue);
+      }
+      return type;
+   }
+}

src/main/java/dk/camelot64/kickc/model/SymbolTypePointer.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;

src/main/java/dk/camelot64/kickc/model/SymbolTypeProcedure.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;

src/main/java/dk/camelot64/kickc/model/SymbolTypeProgram.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 

src/main/java/dk/camelot64/kickc/model/Value.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;

src/main/java/dk/camelot64/kickc/model/Variable.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 

src/main/java/dk/camelot64/kickc/model/VariableIntermediate.java

@@ -1,7 +1,6 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**

src/main/java/dk/camelot64/kickc/model/VariableRef.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

src/main/java/dk/camelot64/kickc/model/VariableReferenceInfo.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import java.util.*;
 

src/main/java/dk/camelot64/kickc/model/VariableRegisterWeights.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import java.util.LinkedHashMap;
 import java.util.List;

src/main/java/dk/camelot64/kickc/model/VariableUnversioned.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

src/main/java/dk/camelot64/kickc/model/VariableVersion.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl;
+package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;

src/main/java/dk/camelot64/kickc/model/jackson/IclJacksonFactory.java

@@ -1,4 +1,4 @@
-package dk.camelot64.kickc.icl.jackson;
+package dk.camelot64.kickc.model.jackson;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;

src/main/java/dk/camelot64/kickc/passes/ParseTreeConstantEvaluator.java

@@ -1,7 +1,7 @@
 package dk.camelot64.kickc.passes;
 
 import dk.camelot64.kickc.NumberParser;
-import dk.camelot64.kickc.icl.*;
+import dk.camelot64.kickc.model.*;
 import dk.camelot64.kickc.parser.KickCBaseVisitor;
 import dk.camelot64.kickc.parser.KickCParser;
 import org.antlr.v4.runtime.tree.TerminalNode;

src/main/java/dk/camelot64/kickc/passes/Pass1EliminateEmptyBlocks.java

@@ -1,7 +1,7 @@
 package dk.camelot64.kickc.passes;
 
 import dk.camelot64.kickc.CompileLog;
-import dk.camelot64.kickc.icl.*;
+import dk.camelot64.kickc.model.*;
 
 import java.util.ArrayList;
 import java.util.Collection;

src/main/java/dk/camelot64/kickc/passes/Pass1GenerateControlFlowGraph.java

@@ -1,6 +1,6 @@
 package dk.camelot64.kickc.passes;
 
-import dk.camelot64.kickc.icl.*;
+import dk.camelot64.kickc.model.*;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

src/main/java/dk/camelot64/kickc/passes/Pass1GenerateSingleStaticAssignmentForm.java

@@ -1,7 +1,7 @@
 package dk.camelot64.kickc.passes;
 
 import dk.camelot64.kickc.CompileLog;
-import dk.camelot64.kickc.icl.*;
+import dk.camelot64.kickc.model.*;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

src/main/java/dk/camelot64/kickc/passes/Pass1GenerateStatementSequence.java

@@ -2,7 +2,7 @@ package dk.camelot64.kickc.passes;
 
 import dk.camelot64.kickc.CompileLog;
 import dk.camelot64.kickc.NumberParser;
-import dk.camelot64.kickc.icl.*;
+import dk.camelot64.kickc.model.*;
 import dk.camelot64.kickc.parser.KickCBaseVisitor;
 import dk.camelot64.kickc.parser.KickCParser;
 import org.antlr.v4.runtime.ParserRuleContext;

src/main/java/dk/camelot64/kickc/passes/Pass1ModifiedVarsAnalysis.java

@@ -1,6 +1,6 @@
 package dk.camelot64.kickc.passes;
 
-import dk.camelot64.kickc.icl.*;
+import dk.camelot64.kickc.model.*;
 
 import java.util.*;
 

src/main/java/dk/camelot64/kickc/passes/Pass1ProcedureCallParameters.java

@@ -1,9 +1,7 @@
 package dk.camelot64.kickc.passes;
 
-import dk.camelot64.kickc.icl.*;
+import dk.camelot64.kickc.model.*;
 
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 

src/main/java/dk/camelot64/kickc/passes/Pass1ProcedureCallsReturnValue.java

@@ -1,10 +1,7 @@
 package dk.camelot64.kickc.passes;
 
-import dk.camelot64.kickc.icl.*;
+import dk.camelot64.kickc.model.*;
 
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.List;
 import java.util.Set;
 
 /**

src/main/java/dk/camelot64/kickc/passes/Pass1TypeInference.java

@@ -1,6 +1,6 @@
 package dk.camelot64.kickc.passes;
 
-import dk.camelot64.kickc.icl.*;
+import dk.camelot64.kickc.model.*;
 
 import java.util.Stack;
 
@@ -42,14 +42,14 @@ public class Pass1TypeInference {
                   if (operator == null || assignment.getrValue1() == null) {
                      // Copy operation or Unary operation
                      RValue rValue = assignment.getrValue2();
-                     SymbolType subType = inferType(programScope, rValue);
-                     SymbolType type = inferType(operator, subType);
+                     SymbolType subType = SymbolTypeInference.inferType(programScope, rValue);
+                     SymbolType type = SymbolTypeInference.inferType(operator, subType);
                      symbol.setTypeInferred(type);
                   } else {
                      // Binary operation
-                     SymbolType type1 = inferType(programScope, assignment.getrValue1());
-                     SymbolType type2 = inferType(programScope, assignment.getrValue2());
-                     SymbolType type = inferType(type1, operator, type2);
+                     SymbolType type1 = SymbolTypeInference.inferType(programScope, assignment.getrValue1());
+                     SymbolType type2 = SymbolTypeInference.inferType(programScope, assignment.getrValue2());
+                     SymbolType type = SymbolTypeInference.inferType(type1, operator, type2);
                      symbol.setTypeInferred(type);
                   }
                }
@@ -71,123 +71,4 @@ public class Pass1TypeInference {
       }
    }
 
-   public static SymbolType inferType(Operator operator, SymbolType subType) {
-      if(operator==null) {
-         return subType;
-      }
-      String op = operator.getOperator();
-      switch (op) {
-         case "*":
-            if(subType instanceof SymbolTypePointer) {
-               return ((SymbolTypePointer) subType).getElementType();
-            } else {
-               throw new RuntimeException("Type error: Dereferencing a non-pointer "+subType);
-            }
-         default:
-            return subType;
-      }
-   }
-
-   public static SymbolType inferType(SymbolType type1, Operator operator, SymbolType type2) {
-      String op = operator.getOperator();
-      switch (op) {
-         case "==":
-         case "<":
-         case "<=":
-         case "=<":
-         case ">":
-         case ">=":
-         case "=>":
-         case "<>":
-         case "!=":
-         case "&&":
-         case "||":
-         case "and":
-         case "or":
-            return SymbolTypeBasic.BOOLEAN;
-         case "+":
-         case "-":
-            if (type1 instanceof SymbolTypePointer && (type2.equals(SymbolTypeBasic.BYTE) || type2.equals(SymbolTypeBasic.WORD))) {
-               return new SymbolTypePointer(((SymbolTypePointer) type1).getElementType());
-            }
-            if (type1 instanceof SymbolTypePointer && type2 instanceof SymbolTypePointer) {
-               SymbolType elmType1 = ((SymbolTypePointer) type1).getElementType();
-               SymbolType elmType2 = ((SymbolTypePointer) type2).getElementType();
-               return inferType(elmType1, operator, elmType2);
-            }
-            if (SymbolTypeBasic.WORD.equals(type1) || SymbolTypeBasic.WORD.equals(type2)) {
-               return SymbolTypeBasic.WORD;
-            } else if (SymbolTypeBasic.BYTE.equals(type1) && SymbolTypeBasic.BYTE.equals(type2)) {
-               return SymbolTypeBasic.BYTE;
-            }
-            throw new RuntimeException("Type inference case not handled " + type1 + " " + operator + " " + type2);
-         case "*":
-            if(type1==null && type2 instanceof SymbolTypePointer) {
-               return ((SymbolTypePointer) type2).getElementType();
-            }
-            if (SymbolTypeBasic.WORD.equals(type1) || SymbolTypeBasic.WORD.equals(type2)) {
-               return SymbolTypeBasic.WORD;
-            } else if (SymbolTypeBasic.BYTE.equals(type1) && SymbolTypeBasic.BYTE.equals(type2)) {
-               return SymbolTypeBasic.BYTE;
-            }
-            throw new RuntimeException("Type inference case not handled " + type1 + " " + operator + " " + type2);
-         case "*idx":
-            if(type1 instanceof SymbolTypePointer) {
-               return ((SymbolTypePointer) type1).getElementType();
-            }
-            throw new RuntimeException("Type inference case not handled " + type1 + " " + operator + " " + type2);
-         case "/":
-            if (SymbolTypeBasic.WORD.equals(type1) || SymbolTypeBasic.WORD.equals(type2)) {
-               return SymbolTypeBasic.WORD;
-            } else if (SymbolTypeBasic.BYTE.equals(type1) && SymbolTypeBasic.BYTE.equals(type2)) {
-               return SymbolTypeBasic.BYTE;
-            }
-            throw new RuntimeException("Type inference case not handled " + type1 + " " + operator + " " + type2);
-         case "<<":
-         case ">>":
-            if (SymbolTypeBasic.WORD.equals(type1)) {
-               return SymbolTypeBasic.WORD;
-            } else if (SymbolTypeBasic.BYTE.equals(type1)) {
-               return SymbolTypeBasic.BYTE;
-            }
-            throw new RuntimeException("Type inference case not handled " + type1 + " " + operator + " " + type2);
-         default:
-            throw new RuntimeException("Type inference case not handled " + type1 + " " + operator + " " + type2);
-      }
-   }
-
-   public static SymbolType inferType(ProgramScope programScope, RValue rValue) {
-      SymbolType type = null;
-      if (rValue instanceof VariableRef) {
-         Variable variable = programScope.getVariable((VariableRef) rValue);
-         type = variable.getType();
-      } else if (rValue instanceof ConstantRef) {
-         ConstantVar constVar = programScope.getConstant((ConstantRef) rValue);
-         type = constVar.getType();
-      } else if (rValue instanceof Symbol) {
-         Symbol rSymbol = (Symbol) rValue;
-         type = rSymbol.getType();
-      } else if (rValue instanceof ConstantInteger) {
-         ConstantInteger rInt = (ConstantInteger) rValue;
-         return rInt.getType(programScope);
-      } else if (rValue instanceof ConstantString) {
-         type = SymbolTypeBasic.STRING;
-      } else if (rValue instanceof ConstantBool) {
-         type = SymbolTypeBasic.BOOLEAN;
-      } else if (rValue instanceof ConstantUnary) {
-         ConstantUnary constUnary = (ConstantUnary) rValue;
-         SymbolType subType = inferType(programScope, constUnary.getOperand());
-         return inferType(constUnary.getOperator(), subType);
-      } else if (rValue instanceof ConstantBinary) {
-         ConstantBinary constBin = (ConstantBinary) rValue;
-         SymbolType leftType = inferType(programScope, constBin.getLeft());
-         SymbolType rightType = inferType(programScope, constBin.getRight());
-         return inferType(leftType, constBin.getOperator(), rightType);
-      }
-      if (type == null) {
-         throw new RuntimeException("Cannot infer type for " + rValue);
-      }
-      return type;
-   }
-
 }

src/main/java/dk/camelot64/kickc/passes/Pass2AliasElimination.java

@@ -1,6 +1,6 @@
 package dk.camelot64.kickc.passes;
 
-import dk.camelot64.kickc.icl.*;
+import dk.camelot64.kickc.model.*;
 
 import java.util.*;
 

src/main/java/dk/camelot64/kickc/passes/Pass2AssertBlocks.java

@@ -1,6 +1,6 @@
 package dk.camelot64.kickc.passes;
 
-import dk.camelot64.kickc.icl.*;
+import dk.camelot64.kickc.model.*;
 
 import java.util.*;
 

src/main/java/dk/camelot64/kickc/passes/Pass2AssertNoCallLvalues.java

@@ -1,11 +1,8 @@
 package dk.camelot64.kickc.passes;
 
-import dk.camelot64.kickc.icl.ControlFlowGraphBaseVisitor;
-import dk.camelot64.kickc.icl.Program;
-import dk.camelot64.kickc.icl.RValue;
-import dk.camelot64.kickc.icl.StatementCall;
-
-import java.util.List;
+import dk.camelot64.kickc.model.ControlFlowGraphBaseVisitor;
+import dk.camelot64.kickc.model.Program;
+import dk.camelot64.kickc.model.StatementCall;
 
 /** Asserts that the program does not contain calls with lValues */
 public class Pass2AssertNoCallLvalues extends Pass2SsaAssertion {

src/main/java/dk/camelot64/kickc/passes/Pass2AssertNoCallParameters.java

@@ -1,8 +1,7 @@
 package dk.camelot64.kickc.passes;
 
-import dk.camelot64.kickc.icl.*;
+import dk.camelot64.kickc.model.*;
 
-import java.util.HashSet;
 import java.util.List;
 
 /** Asserts that the program does not contain calls with parameters */

src/main/java/dk/camelot64/kickc/passes/Pass2AssertNoLabels.java

@@ -1,6 +1,6 @@
 package dk.camelot64.kickc.passes;
 
-import dk.camelot64.kickc.icl.*;
+import dk.camelot64.kickc.model.*;
 
 /** Asserts that the graph contains no label statements */
 public class Pass2AssertNoLabels extends Pass2SsaAssertion {

src/main/java/dk/camelot64/kickc/passes/Pass2AssertNoProcs.java

@@ -1,6 +1,6 @@
 package dk.camelot64.kickc.passes;
 
-import dk.camelot64.kickc.icl.*;
+import dk.camelot64.kickc.model.*;
 
 /** Asserts that the graph contains no proc/endproc statements */
 public class Pass2AssertNoProcs extends Pass2SsaAssertion {

src/main/java/dk/camelot64/kickc/passes/Pass2AssertNoReturnValues.java

@@ -1,8 +1,8 @@
 package dk.camelot64.kickc.passes;
 
-import dk.camelot64.kickc.icl.ControlFlowGraphBaseVisitor;
-import dk.camelot64.kickc.icl.Program;
-import dk.camelot64.kickc.icl.StatementReturn;
+import dk.camelot64.kickc.model.ControlFlowGraphBaseVisitor;
+import dk.camelot64.kickc.model.Program;
+import dk.camelot64.kickc.model.StatementReturn;
 
 /** Asserts that the program does not contain returns with values (as they have been replaced with assignments) */
 public class Pass2AssertNoReturnValues extends Pass2SsaAssertion {

src/main/java/dk/camelot64/kickc/passes/Pass2AssertSymbols.java

@@ -1,6 +1,6 @@
 package dk.camelot64.kickc.passes;
 
-import dk.camelot64.kickc.icl.*;
+import dk.camelot64.kickc.model.*;
 
 import java.util.HashSet;
 

src/main/java/dk/camelot64/kickc/passes/Pass2Base.java

@@ -1,9 +1,9 @@
 package dk.camelot64.kickc.passes;
 
 import dk.camelot64.kickc.CompileLog;
-import dk.camelot64.kickc.icl.ControlFlowGraph;
-import dk.camelot64.kickc.icl.Program;
-import dk.camelot64.kickc.icl.ProgramScope;
+import dk.camelot64.kickc.model.ControlFlowGraph;
+import dk.camelot64.kickc.model.Program;
+import dk.camelot64.kickc.model.ProgramScope;
 
 /** Base class for a compiler pass */
 public class Pass2Base {

src/main/java/dk/camelot64/kickc/passes/Pass2ConditionalJumpSimplification.java

@@ -1,6 +1,6 @@
 package dk.camelot64.kickc.passes;
 
-import dk.camelot64.kickc.icl.*;
+import dk.camelot64.kickc.model.*;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/dk/camelot64/kickc/passes/Pass2ConstantAdditionElimination.java

@@ -1,7 +1,6 @@
 package dk.camelot64.kickc.passes;
 
-import dk.camelot64.kickc.CompileLog;
-import dk.camelot64.kickc.icl.*;
+import dk.camelot64.kickc.model.*;
 
 import java.util.Map;
 

src/main/java/dk/camelot64/kickc/passes/Pass2ConstantIdentification.java

@@ -1,6 +1,6 @@
 package dk.camelot64.kickc.passes;
 
-import dk.camelot64.kickc.icl.*;
+import dk.camelot64.kickc.model.*;
 
 import java.util.LinkedHashMap;
 import java.util.Map;