bug fixes

[IRC.git] / Robust / src / Analysis / TaskStateAnalysis / Predicate.java

diff --git a/Robust/src/Analysis/TaskStateAnalysis/Predicate.java b/Robust/src/Analysis/TaskStateAnalysis/Predicate.java
index 51f4cfe6fd647915c3ff601f83e9afe914278e6b..7fefe6ec6951da34fdf8030e7b71d7e0b7a57079 100644 (file)
--- a/Robust/src/Analysis/TaskStateAnalysis/Predicate.java
+++ b/Robust/src/Analysis/TaskStateAnalysis/Predicate.java
@@ -6,26 +6,28 @@ import IR.Flat.*;
 import Util.Edge;
 
 public class Predicate {
-    public Hashtable<String, VarDescriptor> vardescriptors;
-    public Hashtable<String, HashSet<FlagExpressionNode>> flags;
-    public Hashtable<String, TagExpressionList> tags; //if there is a tag change, we stop the analysis
+    public HashSet<VarDescriptor> vardescriptors;
+    public Hashtable<VarDescriptor, HashSet<FlagExpressionNode>> flags;
+    public Hashtable<VarDescriptor, TagExpressionList> tags; 
+    //if there is a tag change, we stop the analysis
     
     public Predicate(){
-       this.vardescriptors = new Hashtable();
-       this.flags = new Hashtable();
-       this.tags = new Hashtable();
+       this.vardescriptors = new HashSet<VarDescriptor>();
+       this.flags = new Hashtable<VarDescriptor, HashSet<FlagExpressionNode>>();
+       this.tags = new Hashtable<VarDescriptor, TagExpressionList>();
     } 
 
-    public boolean equals(Object o){
-       if(o instanceof Predicate) {
-           Predicate p = (Predicate) o;
-           if(vardescriptors.equals(p.vardescriptors))
+    public boolean equals(Object o) {
+       if (o instanceof Predicate) {
+           Predicate p=(Predicate)o;
+           if (vardescriptors.equals(p.vardescriptors)&&
+               flags.equals(p.flags)&&
+               tags.equals(p.tags))
                return true;
        }
        return false;
     }
-
-    public int hashCode(){
+    public int hashCode() {
        return vardescriptors.hashCode();
     }
 }