Renamed calculate() to calculateLiteral()

src/main/java/dk/camelot64/kickc/model/operators/OperatorAddressOf.java

@@ -11,7 +11,7 @@ public class OperatorAddressOf extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral operand) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral operand) {
       throw new CompileError("Not implemented");
    }
 

src/main/java/dk/camelot64/kickc/model/operators/OperatorBinary.java

@@ -9,6 +9,6 @@ public abstract class OperatorBinary extends Operator {
       super(operator, asmOperator, Type.BINARY, precedence);
    }
 
-   public abstract ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right);
+   public abstract ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right);
 
 }

src/main/java/dk/camelot64/kickc/model/operators/OperatorBoolAnd.java

@@ -13,7 +13,7 @@ public class OperatorBoolAnd extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantInteger(((ConstantInteger) left).getInteger() & ((ConstantInteger) right).getInteger());
       }

src/main/java/dk/camelot64/kickc/model/operators/OperatorBoolNot.java

@@ -12,7 +12,7 @@ public class OperatorBoolNot extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left) {
       if(left instanceof ConstantInteger) {
          return new ConstantInteger(~((ConstantInteger) left).getInteger());
       }

src/main/java/dk/camelot64/kickc/model/operators/OperatorBoolOr.java

@@ -12,7 +12,7 @@ public class OperatorBoolOr extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantInteger(((ConstantInteger) left).getInteger() | ((ConstantInteger) right).getInteger());
       }

src/main/java/dk/camelot64/kickc/model/operators/OperatorBoolXor.java

@@ -12,7 +12,7 @@ public class OperatorBoolXor extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantInteger(((ConstantInteger) left).getInteger() ^ ((ConstantInteger) right).getInteger());
       }

src/main/java/dk/camelot64/kickc/model/operators/OperatorCastByte.java

@@ -13,7 +13,7 @@ public class OperatorCastByte extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral value) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral value) {
       if(value instanceof ConstantInteger) {
          return new ConstantInteger(0xff & ((ConstantInteger) value).getValue());
       } else if(value instanceof ConstantPointer) {

src/main/java/dk/camelot64/kickc/model/operators/OperatorCastDWord.java

@@ -12,7 +12,7 @@ public class OperatorCastDWord extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral value) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral value) {
       if(value instanceof ConstantInteger) {
          return new ConstantInteger(0xffffffffL & ((ConstantInteger) value).getValue());
       }

src/main/java/dk/camelot64/kickc/model/operators/OperatorCastPtrByte.java

@@ -14,7 +14,7 @@ public class OperatorCastPtrByte extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral value) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral value) {
       if(value instanceof ConstantInteger) {
          return new ConstantPointer(((ConstantInteger) value).getInteger(), SymbolType.BYTE);
       }

src/main/java/dk/camelot64/kickc/model/operators/OperatorCastSByte.java

@@ -12,7 +12,7 @@ public class OperatorCastSByte extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral value) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral value) {
       if(value instanceof ConstantInteger) {
          return new ConstantInteger(0xff & ((ConstantInteger) value).getValue());
       }

src/main/java/dk/camelot64/kickc/model/operators/OperatorCastSDWord.java

@@ -12,7 +12,7 @@ public class OperatorCastSDWord extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral value) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral value) {
       if(value instanceof ConstantInteger) {
          return new ConstantInteger(0xffffffffL & ((ConstantInteger) value).getValue());
       }

src/main/java/dk/camelot64/kickc/model/operators/OperatorCastSWord.java

@@ -12,7 +12,7 @@ public class OperatorCastSWord extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral value) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral value) {
       if(value instanceof ConstantInteger) {
          return new ConstantInteger(0xffff & ((ConstantInteger) value).getValue());
       }

src/main/java/dk/camelot64/kickc/model/operators/OperatorCastWord.java

@@ -13,7 +13,7 @@ public class OperatorCastWord extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral value) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral value) {
       if(value instanceof ConstantInteger) {
          return new ConstantInteger(0xffff & ((ConstantInteger) value).getValue());
       }

src/main/java/dk/camelot64/kickc/model/operators/OperatorDWord.java

@@ -12,7 +12,7 @@ public class OperatorDWord extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantInteger(0x10000 * ((ConstantInteger) left).getInteger()  + ((ConstantInteger) right).getInteger());
       }

src/main/java/dk/camelot64/kickc/model/operators/OperatorDecrement.java

@@ -12,7 +12,7 @@ public class OperatorDecrement extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral operand) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral operand) {
       if(operand instanceof ConstantInteger ) {
          return new ConstantInteger(((ConstantInteger) operand).getInteger() -1);
       }

src/main/java/dk/camelot64/kickc/model/operators/OperatorDeref.java

@@ -11,7 +11,7 @@ public class OperatorDeref extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral operand) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral operand) {
       throw new CompileError("Not implemented");
    }
 

src/main/java/dk/camelot64/kickc/model/operators/OperatorDerefIdx.java

@@ -11,7 +11,7 @@ public class OperatorDerefIdx extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       throw new CompileError("Not implemented");
    }
 }

src/main/java/dk/camelot64/kickc/model/operators/OperatorDivide.java

@@ -13,7 +13,7 @@ public class OperatorDivide extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantInteger(((ConstantInteger) left).getInteger() / ((ConstantInteger) right).getInteger());
       } else if(left instanceof ConstantPointer && right instanceof ConstantInteger) {

src/main/java/dk/camelot64/kickc/model/operators/OperatorEqual.java

@@ -15,7 +15,7 @@ public class OperatorEqual extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantBool(Objects.equals(((ConstantInteger) left).getInteger(), ((ConstantInteger) right).getInteger()));
       }

src/main/java/dk/camelot64/kickc/model/operators/OperatorGetHigh.java

@@ -14,7 +14,7 @@ public class OperatorGetHigh extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral operand) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral operand) {
       if(operand instanceof ConstantInteger) {
          ConstantInteger operandInt = (ConstantInteger) operand;
          if(SymbolType.isWord(operandInt.getType())) {

src/main/java/dk/camelot64/kickc/model/operators/OperatorGetLow.java

@@ -14,7 +14,7 @@ public class OperatorGetLow extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral operand) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral operand) {
       if(operand instanceof ConstantInteger) {
          ConstantInteger operandInt = (ConstantInteger) operand;
          if(SymbolType.isWord(operandInt.getType())) {

src/main/java/dk/camelot64/kickc/model/operators/OperatorGreaterThan.java

@@ -13,7 +13,7 @@ public class OperatorGreaterThan extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantBool(((ConstantInteger) left).getInteger() > ((ConstantInteger) right).getInteger());
       }

src/main/java/dk/camelot64/kickc/model/operators/OperatorGreaterThanEqual.java

@@ -13,7 +13,7 @@ public class OperatorGreaterThanEqual extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantBool(((ConstantInteger) left).getInteger() >= ((ConstantInteger) right).getInteger());
       }

src/main/java/dk/camelot64/kickc/model/operators/OperatorIncrement.java

@@ -12,7 +12,7 @@ public class OperatorIncrement extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral operand) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral operand) {
       if(operand instanceof ConstantInteger ) {
          return new ConstantInteger(((ConstantInteger) operand).getInteger() + 1);
       }

src/main/java/dk/camelot64/kickc/model/operators/OperatorLessThan.java

@@ -13,7 +13,7 @@ public class OperatorLessThan extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantBool(((ConstantInteger) left).getInteger() < ((ConstantInteger) right).getInteger());
       }

src/main/java/dk/camelot64/kickc/model/operators/OperatorLessThanEqual.java

@@ -13,7 +13,7 @@ public class OperatorLessThanEqual extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantBool(((ConstantInteger) left).getInteger() <= ((ConstantInteger) right).getInteger());
       }

src/main/java/dk/camelot64/kickc/model/operators/OperatorLogicAnd.java

@@ -12,7 +12,7 @@ public class OperatorLogicAnd extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantBool && right instanceof ConstantBool) {
          return new ConstantBool(((ConstantBool) left).getBool() && ((ConstantBool) right).getBool());
       }

src/main/java/dk/camelot64/kickc/model/operators/OperatorLogicNot.java

@@ -12,7 +12,7 @@ public class OperatorLogicNot extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left) {
       if(left instanceof ConstantBool) {
          return new ConstantBool(!((ConstantBool) left).getBool() );
       }

src/main/java/dk/camelot64/kickc/model/operators/OperatorLogicOr.java

@@ -12,7 +12,7 @@ public class OperatorLogicOr extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantBool && right instanceof ConstantBool) {
          return new ConstantBool(((ConstantBool) left).getBool() || ((ConstantBool) right).getBool());
       }

src/main/java/dk/camelot64/kickc/model/operators/OperatorMinus.java

@@ -12,7 +12,7 @@ public class OperatorMinus extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantInteger(((ConstantInteger) left).getInteger() - ((ConstantInteger) right).getInteger());
       }

src/main/java/dk/camelot64/kickc/model/operators/OperatorMultiply.java

@@ -12,7 +12,7 @@ public class OperatorMultiply extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantInteger(((ConstantInteger) left).getInteger() * ((ConstantInteger) right).getInteger());
       }

src/main/java/dk/camelot64/kickc/model/operators/OperatorNeg.java

@@ -12,7 +12,7 @@ public class OperatorNeg extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral operand) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral operand) {
       if(operand instanceof ConstantInteger) {
          return new ConstantInteger(-((ConstantInteger)operand).getInteger());
       }

src/main/java/dk/camelot64/kickc/model/operators/OperatorNotEqual.java

@@ -15,7 +15,7 @@ public class OperatorNotEqual extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantBool(!Objects.equals(((ConstantInteger) left).getInteger(), ((ConstantInteger) right).getInteger()));
       }

src/main/java/dk/camelot64/kickc/model/operators/OperatorPlus.java

@@ -12,7 +12,7 @@ public class OperatorPlus extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantInteger(((ConstantInteger) left).getInteger() + ((ConstantInteger) right).getInteger());
       } else if(left instanceof ConstantInteger && right instanceof ConstantChar) {

src/main/java/dk/camelot64/kickc/model/operators/OperatorPos.java

@@ -12,7 +12,7 @@ public class OperatorPos extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral operand) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral operand) {
       if(operand instanceof ConstantInteger) {
          return new ConstantInteger(+((ConstantInteger)operand).getInteger());
       }

src/main/java/dk/camelot64/kickc/model/operators/OperatorSetHigh.java

@@ -11,7 +11,7 @@ public class OperatorSetHigh extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       throw new CompileError("Not implemented");
    }
 }

src/main/java/dk/camelot64/kickc/model/operators/OperatorSetLow.java

@@ -11,7 +11,7 @@ public class OperatorSetLow extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       throw new CompileError("Not implemented");
    }
 

src/main/java/dk/camelot64/kickc/model/operators/OperatorShiftLeft.java

@@ -13,7 +13,7 @@ public class OperatorShiftLeft extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantInteger( ((ConstantInteger) left).getInteger() << ((ConstantInteger) right).getInteger());
       }

src/main/java/dk/camelot64/kickc/model/operators/OperatorShiftRight.java

@@ -12,7 +12,7 @@ public class OperatorShiftRight extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantInteger( ((ConstantInteger) left).getInteger() >> ((ConstantInteger) right).getInteger());
       }

src/main/java/dk/camelot64/kickc/model/operators/OperatorUnary.java

@@ -9,5 +9,5 @@ public abstract class OperatorUnary extends Operator {
       super(operator, asmOperator, Type.UNARY, precedence);
    }
 
-   public abstract ConstantLiteral calculate(ConstantLiteral operand);
+   public abstract ConstantLiteral calculateLiteral(ConstantLiteral operand);
 }

src/main/java/dk/camelot64/kickc/model/operators/OperatorWord.java

@@ -12,7 +12,7 @@ public class OperatorWord extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantInteger(0x100 * ((ConstantInteger) left).getInteger()  + ((ConstantInteger) right).getInteger());
       }