1 files changed, 12 insertions, 11 deletions
diff --git a/code/simpleSableCCCalulator/sableCCCalculator/ProgramStack.java b/code/simpleSableCCCalulator/sableCCCalculator/ProgramStack.java
index 1875e57..c1046ee 100644
--- a/code/simpleSableCCCalulator/sableCCCalculator/ProgramStack.java
+++ b/code/simpleSableCCCalulator/sableCCCalculator/ProgramStack.java
@@ -1,26 +1,27 @@
 package sableCCCalculator;
-import sableCCCalculator.node.*;
+import sableCCCalculator.types.*;
 import java.util.Stack;
 
-public class ProgramStack<T extends Token> extends Stack<T> {
+public class ProgramStack<T extends Type> extends Stack<T> {
     
     public String toString() {
         String out = "Stack is now: [";
         for (int i = 0; i < this.size(); i++) {
-            String theStr = this.elementAt(i).toString();
-            out += String.format("%s, ", theStr.substring(0, theStr.length() - 1));
+            // String theStr = this.elementAt(i).toString();
+            // out += String.format("%s, ", theStr.substring(0, theStr.length() - 1));
+            out += String.format("%s, ", this.elementAt(i).toString());
         }
         return out.substring(0, out.length() - 2) + "]";
     }
 
     public static void main(String[] args) {
-        ProgramStack<Token> myStack = new ProgramStack<>();
-        myStack.add(new TNumber("2"));
-        myStack.add(new TNumber("4"));
-        myStack.add(new TNumber("6"));
-        myStack.add(new TNumber("0"));
-        myStack.add(new TNumber("1"));
-        myStack.add(new TDouble("24601.10642"));
+        ProgramStack<Type> myStack = new ProgramStack<>();
+        myStack.add(new Int(2));
+        myStack.add(new Int(4));
+        myStack.add(new Int(6));
+        myStack.add(new Int(0));
+        myStack.add(new Int(1));
+        myStack.add(new Decimal(24601.10642));
 
         System.out.println(myStack.pop().getText());
         System.out.println(myStack);