adds global, this, and static tags for var id

diff --git a/Robust/src/Analysis/SSJava/VarID.java b/Robust/src/Analysis/SSJava/VarID.java
index 4e8c0adde2252a40ed5c20893141d6cef7fab9a6..64ea8375c364104dbaf3f4f9785698b460ba42f8 100644 (file)
--- a/Robust/src/Analysis/SSJava/VarID.java
+++ b/Robust/src/Analysis/SSJava/VarID.java
@@ -3,48 +3,83 @@ package Analysis.SSJava;
 import java.util.ArrayList;
 import IR.Descriptor;
 
-public class VarID {
-
-  // contains field and var descriptors
-  // given the case a.b.f it contains descriptors for a,b, and f
-  private ArrayList<Descriptor> var;
-  // properties of ID
-  private boolean isThis;
-  private boolean isGlobal;
-  private boolean isTop;
-
-  public VarID(Descriptor var) {
-    this.var = new ArrayList<Descriptor>();
-    this.var.add(var);
-    isThis = false;
-    isGlobal = false;
-    isTop = false;
-  }
-
-  public void addAccess(Descriptor var) {
-    this.var.add(var);
-  }
-
-  public void setThis() {
-    isThis = true;
-  }
-
-  public void setGlobal() {
-    isGlobal = true;
-  }
-
-  public void setTop() {
-    isTop = true;
-  }
-
-  public String toString() {
-    String toReturn = "";
-    for (Descriptor d : var)
-      toReturn += d.toString() + " ";
-    return toReturn;
-  }
-
-  public void setReturn() {
-    //interim fixes
-  }
+public class VarID{
+    
+    //contains field and var descriptors
+    //given the case a.b.f it contains descriptors for a,b, and f
+    private ArrayList<Descriptor> var;
+    //properties of ID
+    private boolean isThis;
+    private boolean isGlobal;
+    private boolean isTop;
+    private boolean isReturn;
+
+    public VarID(){
+       this.var = new ArrayList<Descriptor>();
+       isThis = false;
+       isGlobal = false;
+       isTop = false;
+       isReturn = false;
+    }
+    public VarID(Descriptor var){
+       this.var = new ArrayList<Descriptor>();
+       this.var.add(var);
+       isThis = false;
+       isGlobal = false;
+       isTop = false;
+       isReturn = false;
+    }
+    
+    public void addAccess(Descriptor var){
+       this.var.add(var);
+    }
+    
+    public ArrayList<Descriptor> getDesc(){
+       return var;
+    }
+
+    public void setThis(){
+       isThis = true;
+    }
+    
+    public boolean isThis(){
+       return isThis;
+    }
+
+    public void setGlobal(){
+       isGlobal = true;
+    }
+
+    public boolean isGlobal(){
+       return isGlobal;
+    }
+
+    public void setTop(){
+       isTop = true;
+    }
+    
+    public boolean isTop(){
+       return isTop;
+    }
+    
+    public void setReturn(){
+       isReturn = true;
+    }
+
+    public boolean isReturn(){
+       return isReturn;
+    }
+
+    public boolean equals(VarID id){
+       return var.equals(id.getDesc());
+    }
+
+    public String toString(){
+       if(isReturn)
+           return "RETURN";
+       String toReturn = "";
+       for(Descriptor d: var)
+           toReturn += d.toString() + " ";
+       return toReturn;
+    }
 }
\ No newline at end of file