From 5677447c250dcf0c970fe7ce4ac51f47bf6d6da0 Mon Sep 17 00:00:00 2001 From: bd-912 Date: Sat, 11 May 2024 15:32:13 -0600 Subject: Changed SymbolTable to throw and exception when searching for missing entries --- heat/HeatVisitor.java | 32 -------------------------------- 1 file changed, 32 deletions(-) (limited to 'heat/HeatVisitor.java') diff --git a/heat/HeatVisitor.java b/heat/HeatVisitor.java index 2e830c5..ae3d150 100644 --- a/heat/HeatVisitor.java +++ b/heat/HeatVisitor.java @@ -329,9 +329,6 @@ public class HeatVisitor extends GJDepthFirst> if (n.f0.which == 3) { String id = ((Identifier) n.f0.choice).f0.tokenImage; ClassInstance c = this.symt.getClass(id); - if (c == null) - throw new TypecheckException(String.format("%s was never declared!", - id)); _ret = new TypeBundle(TypeEnum.classname, c); } else _ret = n.f0.accept(this, argu); @@ -444,12 +441,6 @@ public class HeatVisitor extends GJDepthFirst> n.getClass().getSimpleName())); /////////////////////////////////////////////////////////////// TypeInstance t = this.symt.getType(id); - if (t == null) - t = this.symt.getTypeAttr(id); - if (t == null) - throw new TypecheckException(String.format("%s found that %s was never declared!", - n.getClass().getSimpleName(), - id)); TypeBundle tb = new TypeBundle(t.getType(), t.getClassInstance()); _ret = n.f2.accept(this, argu); @@ -485,12 +476,6 @@ public class HeatVisitor extends GJDepthFirst> n.getClass().getSimpleName())); /////////////////////////////////////////////////////////////// TypeInstance t = this.symt.getType(id); - if (t == null) - t = this.symt.getTypeAttr(id); - if (t == null) - throw new TypecheckException(String.format("%s found that %s was never declared!", - n.getClass().getSimpleName(), - id)); if (t.getType() != TypeEnum.intarray) throw new TypecheckException(String.format("%s called on %s, a non-array!", n.getClass().getSimpleName(), @@ -783,12 +768,6 @@ public class HeatVisitor extends GJDepthFirst> case 3: MinimalLogger.info(String.format("Message send found IDENTIFIER")); t = this.symt.getType(((Identifier) n.f0.f0.choice).f0.tokenImage); - if (t == null) - t = this.symt.getTypeAttr(((Identifier) n.f0.f0.choice).f0.tokenImage); - if (t == null) - throw new TypecheckException(String.format("%s found that %s was never declared!", - n.getClass().getSimpleName(), - ((Identifier) n.f0.f0.choice).f0.tokenImage)); // HOW TO CALL? break; case 4: MinimalLogger.info(String.format("Message send found THIS")); @@ -819,13 +798,7 @@ public class HeatVisitor extends GJDepthFirst> n.getClass().getSimpleName())); MethodInstance m = this.symt.getMethod(n.f2.f0.tokenImage, t.getClassInstance()); - if (m == null) - throw new TypecheckException(String.format("%s called a method not part of %s!", - n.getClass().getSimpleName(), - t.getName())); - MinimalLogger.severe(String.format("Class instance was: %s", t.getClassInstance())); - MinimalLogger.severe(String.format("M was: %s with args %s", m, m.getParentClass())); ArrayList actual = new ArrayList(); ArrayList expected = new ArrayList(); n.f4.accept(this, actual); @@ -978,11 +951,6 @@ public class HeatVisitor extends GJDepthFirst> n.getClass().getSimpleName())); /////////////////////////////////////////////////////////////// TypeInstance t = this.symt.getType(n.f0.tokenImage); - if (t == null) - t = this.symt.getTypeAttr(n.f0.tokenImage); - if (t == null) - throw new TypecheckException(String.format("%s was never declared!", - n.f0.tokenImage)); _ret = new TypeBundle(t.getType(), t.getClassInstance()); /////////////////////////////////////////////////////////////// MinimalLogger.info(String.format("<- %s with %s", -- cgit v1.2.3