From e8af241aa57104d62c25c8bcbc2df76510998bf9 Mon Sep 17 00:00:00 2001
From: bd-912 <bdunahu@colostate.edu>
Date: Mon, 25 Mar 2024 16:58:51 -0600
Subject: All tests run, basic rules implemented

---
 minijava/TypeCheckSimp.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'minijava/TypeCheckSimp.java')

diff --git a/minijava/TypeCheckSimp.java b/minijava/TypeCheckSimp.java
index 57b6be9..8daa2b1 100644
--- a/minijava/TypeCheckSimp.java
+++ b/minijava/TypeCheckSimp.java
@@ -29,9 +29,6 @@ public class TypeCheckSimp implements GJVisitor<TypeInstance,HashMap<String,Type
         Utilities.print_filter("", true);
     }
 
-    //
-    // Auto class visitors--probably don't need to be overridden.
-    //
     public TypeInstance visit(NodeList n, HashMap<String,TypeInstance> argu) {
         ++this.offset;
         this.printNode(n, argu, true, null);
@@ -112,6 +109,7 @@ public class TypeCheckSimp implements GJVisitor<TypeInstance,HashMap<String,Type
     public TypeInstance visit(NodeToken n, HashMap<String,TypeInstance> argu) {
         // A fixed string token. '⌣'
         ++this.offset;
+        // Utilities.print_filter("Node " + n.toString(), true);
         // this.printNode(n, argu, false, null);
         --this.offset;
         return null;
@@ -955,7 +953,8 @@ public class TypeCheckSimp implements GJVisitor<TypeInstance,HashMap<String,Type
         ++this.offset;
         this.printNode(n, argu, true, null);
 
-        TypeInstance ret = argu.get(n.f0.tokenImage);
+        TypeInstance ret = (argu.get(n.f0.tokenImage) != null) ?
+            argu.get(n.f0.tokenImage) : new TypeInstance(null, TypeEnum.ERROR);
 
         this.printNode(n, argu, false, ret.get_type());
         --this.offset;
@@ -994,9 +993,9 @@ public class TypeCheckSimp implements GJVisitor<TypeInstance,HashMap<String,Type
         this.printNode(n, argu, true, null);
 
         n.f0.accept(this, argu);
-        TypeInstance ret = n.f1.accept(this, argu);
+        n.f1.accept(this, argu);
         n.f2.accept(this, argu);
-        n.f3.accept(this, argu);
+        TypeInstance ret = n.f3.accept(this, argu);
         n.f4.accept(this, argu);
         ret = (ret.get_type() == TypeEnum.integer) ? new TypeInstance(null, TypeEnum.int_array) :
             new TypeInstance(null, TypeEnum.ERROR);
-- 
cgit v1.2.3