Added SymTableFirst, the completed first visitor

2 files changed, 252 insertions, 19 deletions

diff --git a/Typecheck.java b/Typecheck.java
index 23f2efc..070b71e 100644
--- a/Typecheck.java
+++ b/Typecheck.java
@@ -21,28 +21,23 @@ public class Typecheck {
 
             // Build the symbol table. Top-down visitor, inherits from
             // GJDepthFirst<R,A>. R=Void, A=Integer.
-            SymTableVis pv = new SymTableVis();
-            root.accept(pv, new ArrayList<TypeInstance>());
-            HashMap<String, AbstractInstance> symt = pv.symt;
+            SymbolTable st = new SymbolTable();
+            root.accept(new SymTableFirst<Void>(), st);
+            // root.accept(new SymTableSecond(), st);
             PrintFilter.print("===================================================", true);
 
-            // Do type checking. Bottom-up visitor, also inherits from
-            // GJDepthFirst. Visit functions return MyTpe (=R), and
-            // take a symbol table (HashMap<String,String>) as
-            // argument (=A). You may implement things differently of
-            // course!
-            TypeCheckSimp ts = new TypeCheckSimp();
-            TypeInstance res = root.accept(ts, symt);
+            // TypeCheckSimp ts = new TypeCheckSimp();
+            // TypeInstance res = root.accept(ts, symt);
 
-            // Ugly code not to be inspired from: "my" way of storing
-            // type info / typecheck property: if some of my internal
-            // structure is empty, then things don't typecheck for
-            // me. This is specific to my own implementation.
-            // if (res != null && res.type_array.size() > 0)
-            if (res.get_type() != TypeEnum.ERROR)
-                System.out.println("Program type checked successfully");
-            else
-                System.out.println("Type error");
+            // // Ugly code not to be inspired from: "my" way of storing
+            // // type info / typecheck property: if some of my internal
+            // // structure is empty, then things don't typecheck for
+            // // me. This is specific to my own implementation.
+            // // if (res != null && res.type_array.size() > 0)
+            // if (res.get_type() != TypeEnum.ERROR)
+            //     System.out.println("Program type checked successfully");
+            // else
+            //     System.out.println("Type error");
         }
         catch (ParseException e) {
             System.out.println(e.toString());
diff --git a/st/SymTableFirst.java b/st/SymTableFirst.java
new file mode 100644
index 0000000..13380fd
--- /dev/null
+++ b/st/SymTableFirst.java
@@ -0,0 +1,238 @@
+package st;
+
+import syntaxtree.*;
+import visitor.*;
+import java.util.*;
+import misc.*;
+
+/**
+ * Performs a preliminary visit through the AST,
+ * initializing all Instances and placing them in the table.
+ */
+public class SymTableFirst<R> extends GJDepthFirst<R,SymbolTable> {
+
+    /**
+     * f0 -> "class"
+     * f1 -> Identifier()
+     * f2 -> "{"
+     * f3 -> "public"
+     * f4 -> "static"
+     * f5 -> "void"
+     * f6 -> "main"
+     * f7 -> "("
+     * f8 -> "String"
+     * f9 -> "["
+     * f10 -> "]"
+     * f11 -> Identifier()
+     * f12 -> ")"
+     * f13 -> "{"
+     * f14 -> ( VarDeclaration() )*
+     * f15 -> ( Statement() )*
+     * f16 -> "}"
+     * f17 -> "}"
+     */
+    public R visit(MainClass n, SymbolTable symt) {
+        n.f0.accept(this, symt);
+        n.f1.accept(this, symt);
+        n.f2.accept(this, symt);
+        n.f3.accept(this, symt);
+        n.f4.accept(this, symt);
+        n.f5.accept(this, symt);
+        n.f6.accept(this, symt);
+        n.f7.accept(this, symt);
+        n.f8.accept(this, symt);
+        n.f9.accept(this, symt);
+        n.f10.accept(this, symt);
+        n.f11.accept(this, symt);
+        n.f12.accept(this, symt);
+        n.f13.accept(this, symt);
+        n.f14.accept(this, symt);
+        n.f15.accept(this, symt);
+        n.f16.accept(this, symt);
+        n.f17.accept(this, symt);
+
+
+        String id = n.f1.f0.tokenImage;
+        ClassInstance instance = new ClassInstance(id);
+        PrintFilter.print("Inserting " + id + " => " + instance.getType(), true);
+        symt.put(id, instance);
+
+        id = "main";
+        MethodInstance main = new MethodInstance(id, TypeEnum.ERROR);
+        PrintFilter.print("Inserting " + id + " => " + main.getType(), true);
+        symt.put(id, main);
+
+
+        return null;
+    }
+
+    /**
+     * f0 -> "class"
+     * f1 -> Identifier()
+     * f2 -> "{"
+     * f3 -> ( VarDeclaration() )*
+     * f4 -> ( MethodDeclaration() )*
+     * f5 -> "}"
+     */
+    public R visit(ClassDeclaration n, SymbolTable symt) {
+        n.f0.accept(this, symt);
+        n.f1.accept(this, symt);
+        n.f2.accept(this, symt);
+        n.f3.accept(this, symt);
+        n.f4.accept(this, symt);
+        n.f5.accept(this, symt);
+
+
+        String id = n.f1.f0.tokenImage;
+        ClassInstance instance = new ClassInstance(id);
+        PrintFilter.print("Inserting " + id + " => " + instance.getType(), true);
+        symt.put(id, instance);
+
+
+        return null;
+    }
+
+    /**
+     * f0 -> "class"
+     * f1 -> Identifier()
+     * f2 -> "extends"
+     * f3 -> Identifier()
+     * f4 -> "{"
+     * f5 -> ( VarDeclaration() )*
+     * f6 -> ( MethodDeclaration() )*
+     * f7 -> "}"
+     */
+    public R visit(ClassExtendsDeclaration n, SymbolTable symt) {
+        n.f0.accept(this, symt);
+        n.f1.accept(this, symt);
+        n.f2.accept(this, symt);
+        n.f3.accept(this, symt);
+        n.f4.accept(this, symt);
+        n.f5.accept(this, symt);
+        n.f6.accept(this, symt);
+        n.f7.accept(this, symt);
+
+
+        String id = n.f1.f0.tokenImage;
+        ClassInstance instance = new ClassInstance(id);
+        PrintFilter.print("Inserting " + id + " => " + instance.getType(), true);
+        symt.put(id, instance);
+
+
+        return null;
+    }
+
+    /**
+     * f0 -> Type()
+     * f1 -> Identifier()
+     * f2 -> ";"
+     */
+    public R visit(VarDeclaration n, SymbolTable symt) {
+        n.f0.accept(this, symt);
+        n.f1.accept(this, symt);
+        n.f2.accept(this, symt);
+
+        String id = n.f1.f0.tokenImage;
+        TypeEnum rtrn = TypeEnum.ERROR;
+        switch (n.f0.f0.which) {
+        case 0:
+            rtrn = TypeEnum.intarray; break;
+        case 1:
+            rtrn = TypeEnum.bool; break;
+        case 2:
+            rtrn = TypeEnum.integer; break;
+        default:
+            PrintFilter.print("Unsupported case", true);
+        }
+
+        TypeInstance instance = new TypeInstance(id, rtrn);
+        PrintFilter.print("Inserting " + id + "=> " + instance.getType(), true);
+        symt.put(id, instance);
+
+
+        return null;
+    }
+
+    /**
+     * f0 -> "public"
+     * f1 -> Type()
+     * f2 -> Identifier()
+     * f3 -> "("
+     * f4 -> ( FormalParameterList() )?
+     * f5 -> ")"
+     * f6 -> "{"
+     * f7 -> ( VarDeclaration() )*
+     * f8 -> ( Statement() )*
+     * f9 -> "return"
+     * f10 -> Expression()
+     * f11 -> ";"
+     * f12 -> "}"
+     */
+    public R visit(MethodDeclaration n, SymbolTable symt) {
+        n.f0.accept(this, symt);
+        n.f1.accept(this, symt);
+        n.f2.accept(this, symt);
+        n.f3.accept(this, symt);
+        n.f4.accept(this, symt);
+        n.f5.accept(this, symt);
+        n.f6.accept(this, symt);
+        n.f7.accept(this, symt);
+        n.f8.accept(this, symt);
+        n.f9.accept(this, symt);
+        n.f10.accept(this, symt);
+        n.f11.accept(this, symt);
+        n.f12.accept(this, symt);
+
+
+        String id = n.f2.f0.tokenImage;
+        TypeEnum rtrn = TypeEnum.ERROR;
+        switch (n.f1.f0.which) {
+        case 0:
+            rtrn = TypeEnum.intarray; break;
+        case 1:
+            rtrn = TypeEnum.bool; break;
+        case 2:
+            rtrn = TypeEnum.integer; break;
+        default:
+            PrintFilter.print("Unsupported case", true);
+        }
+
+        MethodInstance instance = new MethodInstance(id, rtrn);
+        PrintFilter.print("Inserting " + id + " => " + instance.getType(), true);
+        symt.put(id, instance);
+
+
+        return null;
+    }
+
+    /**
+     * f0 -> Type()
+     * f1 -> Identifier()
+     */
+    public R visit(FormalParameter n, SymbolTable symt) {
+        n.f0.accept(this, symt);
+        n.f1.accept(this, symt);
+
+
+        String id = n.f1.f0.tokenImage;
+        TypeEnum rtrn = TypeEnum.ERROR;
+        switch (n.f0.f0.which) {
+        case 0:
+            rtrn = TypeEnum.intarray; break;
+        case 1:
+            rtrn = TypeEnum.bool; break;
+        case 2:
+            rtrn = TypeEnum.integer; break;
+        default:
+            PrintFilter.print("Unsupported case", true);
+        }
+
+        TypeInstance instance = new TypeInstance(id, rtrn);
+        PrintFilter.print("Inserting " + id + " => " + instance.getType(), true);
+        symt.put(id, instance);
+
+
+        return null;
+    }
+
+}