Rewrote Symbol Table to be more context aware and avoid collisions

1 files changed, 12 insertions, 8 deletions

diff --git a/J2V.java b/J2V.java
index d19b84e..16f26df 100644
--- a/J2V.java
+++ b/J2V.java
@@ -21,14 +21,18 @@ public class J2V {
             // Build the symbol table. Top-down visitor, inherits from
             // GJDepthFirst<R,A>. R=Void, A=Integer.
             SymbolTable symt = new SymbolTable();
-            root.accept(new SymTableBottomUp<Void>(), symt);
-            root.accept(new SymTableTopDown<Void>(), symt);
-
-            BoilVisitor vp = new BoilVisitor(symt);
-            root.accept(vp, null);
-
-            MinimalLogger.info("===================================================");
-            System.out.println(vp.getVapor());
+            MinimalLogger.info("Populating classes...");
+            root.accept(new SymTableClasses<Void>(), symt);
+            MinimalLogger.info("Populating methods...");
+            root.accept(new SymTableMethods<Void>(), symt);
+            MinimalLogger.info("Populating variables...");
+            root.accept(new SymTableVars<Void>(), symt);
+
+            // BoilVisitor vp = new BoilVisitor(symt);
+            // root.accept(vp, null);
+
+            // MinimalLogger.info("===================================================");
+            // System.out.println(vp.getVapor());
 
 
         }