1 files changed, 30 insertions, 28 deletions

diff --git a/code/simpleSableCCCalulator/sableCCCalculator/Translation.java b/code/simpleSableCCCalulator/sableCCCalculator/Translation.java
index a673edb..737ecbd 100644
--- a/code/simpleSableCCCalulator/sableCCCalculator/Translation.java
+++ b/code/simpleSableCCCalulator/sableCCCalculator/Translation.java
@@ -1,88 +1,90 @@
 package sableCCCalculator;
+import sableCCCalculator.SymbolTable.SymbolTableIndex;
 import sableCCCalculator.analysis.*;
 import sableCCCalculator.types.*;
 import sableCCCalculator.node.*;
 
 class Translation extends DepthFirstAdapter
 {
-    private ProgramStack<Type> programStack = new ProgramStack<>();
+    private ProgramStack programStack = new ProgramStack();
+    private SymbolTable symbolTable = new SymbolTable();
 
     public void caseTNumber(TNumber node)
     {
         System.out.println("Pushing " + Integer.parseInt(node.getText()) + " to stack");
-        programStack.push(new Int(node.getText()));
-        System.out.println(programStack);
+        programStack.push(symbolTable.addConstant(new Int(node.getText())));
+        System.out.println(programStack.toString(symbolTable));
     }
 
     public void caseTDouble(TDouble node)
     {
         System.out.println("Pushing a double: " + Double.parseDouble(node.getText()));
-        programStack.push(new Decimal(node.getText()));
-        System.out.println(programStack);
+        programStack.push(symbolTable.addConstant(new Decimal(node.getText())));
+        System.out.println(programStack.toString(symbolTable));
     }
 
     public void outASineTerm(ASineTerm node) 
     {
-        Double num = Double.parseDouble(programStack.pop().getText());
+        Double num = Double.parseDouble(symbolTable.get(programStack.pop()).toString());
         System.out.println("Popped " + num);
         Double out = Math.sin(Math.toRadians(num));
-        programStack.push(new Decimal(out));
+        programStack.push(symbolTable.addConstant(new Decimal(out)));
         System.out.println("Pushed sin(" + num + ") = " + out + " to stack");
-        System.out.println(programStack);
+        System.out.println(programStack.toString(symbolTable));
     }
 
     public void outAPlusExpr(APlusExpr node)
     {
-        Type op2 = programStack.pop();
-        Type op1 = programStack.pop();
+        Type op2 = symbolTable.get(programStack.pop());
+        Type op1 = symbolTable.get(programStack.pop());
         System.out.println("Popped " + op1 + " and " + op2 + " from stack");
         Type out = op1.add(op2);
-        programStack.push(out);
+        programStack.push(symbolTable.addConstant(out));
         System.out.println("Pushed " + op1 + "+" + op2 + "=" + out + " to stack");
-        System.out.println(programStack);
+        System.out.println(programStack.toString(symbolTable));
     }
 
     public void outAMinusExpr(AMinusExpr node)
     {
-        Type op2 = programStack.pop();
-        Type op1 = programStack.pop();
+        Type op2 = symbolTable.get(programStack.pop());
+        Type op1 = symbolTable.get(programStack.pop());
         System.out.println("Popped " + op1 + " and " + op2 + " from stack");
         Type out = op1.sub(op2);
-        programStack.push(out);
+        programStack.push(symbolTable.addConstant(out));
         System.out.println("Pushed " + op1 + "-" + op2 + "=" + out + " to stack");
-        System.out.println(programStack);
+        System.out.println(programStack.toString(symbolTable));
     }
 
     public void outAMultFactor(AMultFactor node)
     {
-        Type op2 = programStack.pop();
-        Type op1 = programStack.pop();
+        Type op2 = symbolTable.get(programStack.pop());
+        Type op1 = symbolTable.get(programStack.pop());
         System.out.println("Popped " + op1 + " and " + op2 + " from stack");
         Type out = op1.mult(op2);
-        programStack.push(out);
+        programStack.push(symbolTable.addConstant(out));
         System.out.println("Pushed " + op1 + "*" + op2 + "=" + out + " to stack");
-        System.out.println(programStack);
+        System.out.println(programStack.toString(symbolTable));
     }
 
     public void outADivFactor(ADivFactor node)
     {
-        Type op2 = programStack.pop();
-        Type op1 = programStack.pop();
+        Type op2 = symbolTable.get(programStack.pop());
+        Type op1 = symbolTable.get(programStack.pop());
         System.out.println("Popped " + op1 + " and " + op2 + " from stack");
         Type out = op1.div(op2);
-        programStack.push(out);
+        programStack.push(symbolTable.addConstant(out));
         System.out.println("Pushed " + op1 + "/" + op2 + "=" + out + " to stack");
-        System.out.println(programStack);
+        System.out.println(programStack.toString(symbolTable));
     }
 
     public void outAModFactor(AModFactor node)
     {
-        Type op2 = programStack.pop();
-        Type op1 = programStack.pop();
+        Type op2 = symbolTable.get(programStack.pop());
+        Type op1 = symbolTable.get(programStack.pop());
         System.out.println("Popped " + op1 + " and " + op2 + " from stack");
         Type out = op1.mod(op2);
-        programStack.push(out);
+        programStack.push(symbolTable.addConstant(out));
         System.out.println("Pushed " + op1 + "%" + op2 + "=" + out + " to stack");
-        System.out.println(programStack);
+        System.out.println(programStack.toString(symbolTable));
     }
 }