checking in changes

[IRC.git] / Robust / src / IR / State.java

diff --git a/Robust/src/IR/State.java b/Robust/src/IR/State.java
index 1bd8067e1b3562c9d2ccc20c2e931c4e6c0585ca..a83b1af73e49f989fc3c014597cc040e1bf7d2e9 100644 (file)
--- a/Robust/src/IR/State.java
+++ b/Robust/src/IR/State.java
@@ -6,16 +6,14 @@ import java.util.*;
 
 public class State {
     public State(ParseNode parsetree) {
-       globals=new SymbolTable();
        this.parsetree=parsetree;
-       this.classset=new HashSet();
+       this.classes=new SymbolTable();
        this.treemethodmap=new Hashtable();
        this.flatmethodmap=new Hashtable();
     }
 
-    public SymbolTable globals;
+    public SymbolTable classes;
     public ParseNode parsetree;
-    public HashSet classset;
     public Hashtable treemethodmap;
     public Hashtable flatmethodmap;
 
@@ -30,12 +28,17 @@ public class State {
     }
 
     public void addClass(ClassDescriptor tdn) {
-       classset.add(tdn);
+       if (classes.contains(tdn.getSymbol()))
+           throw new Error("Class "+tdn.getSymbol()+" defined twice");
+       classes.add(tdn);
     }
 
     public BlockNode getMethodBody(MethodDescriptor md) {
        return (BlockNode)treemethodmap.get(md);
-       
+    }
+
+    public SymbolTable getClassSymbolTable() {
+       return classes;
     }
 
     public FlatMethod getMethodFlat(MethodDescriptor md) {