X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Robust%2Fsrc%2FAnalysis%2FOwnershipAnalysis%2FTokenTuple.java;h=00d9561a2fe6238a03ae574d55a5575af24c1c94;hb=13a63ea76172e2fd0ce7987bf81845c44c839d55;hp=b48d5bd80f68051201338699302a5678b1711f1b;hpb=13259bcd0608e093a8653d206689ea0c52e3485a;p=IRC.git

diff --git a/Robust/src/Analysis/OwnershipAnalysis/TokenTuple.java b/Robust/src/Analysis/OwnershipAnalysis/TokenTuple.java
index b48d5bd8..00d9561a 100644
--- a/Robust/src/Analysis/OwnershipAnalysis/TokenTuple.java
+++ b/Robust/src/Analysis/OwnershipAnalysis/TokenTuple.java
@@ -14,34 +14,42 @@ import java.io.*;
 public class TokenTuple extends Canonical {
 
   private Integer token;
-  private boolean isNewSummary;
+  private boolean isMultiObject;
 
-
-  // only summary tokens should have ARITY_MANY?
-  // acutally, multiple-object regions can be arity-many
-  // so isNewSummary actually means "multi-object" in
-  // this class.  CHANGE THIS SOMETIME!
-  public static final int ARITY_ONE  = 1;
-  public static final int ARITY_MANY = 2;
+  public static final int ARITY_ZEROORMORE = 0;
+  public static final int ARITY_ONE        = 1;
+  public static final int ARITY_ONEORMORE  = 2;
   private int arity;
 
 
   public TokenTuple(HeapRegionNode hrn) {
     assert hrn != null;
 
-    token        = hrn.getID();
-    isNewSummary = hrn.isNewSummary();
-    arity        = ARITY_ONE;
+    token         = hrn.getID();
+    isMultiObject = !hrn.isSingleObject();
+    arity         = ARITY_ONE;
+    fixStuff();
   }
 
   public TokenTuple(Integer token,
-                    boolean isNewSummary,
+                    boolean isMultiObject,
                     int arity) {
     assert token != null;
 
-    this.token        = token;
-    this.isNewSummary = isNewSummary;
-    this.arity        = arity;
+    this.token         = token;
+    this.isMultiObject = isMultiObject;
+    this.arity         = arity;
+    fixStuff();
+  }
+
+  private void fixStuff() {
+    //This is an evil hack...we should fix this stuff elsewhere...
+    if (!isMultiObject) {
+      arity=ARITY_ONE;
+    } else {
+      if (arity==ARITY_ONEORMORE)
+        arity=ARITY_ZEROORMORE;
+    }
   }
 
 
@@ -53,18 +61,39 @@ public class TokenTuple extends Canonical {
   public Integer getToken() {
     return token;
   }
-  public int     getArity() {
+
+  public boolean isMultiObject() {
+    return isMultiObject;
+  }
+
+  public int getArity() {
     return arity;
   }
 
 
-  public TokenTuple increaseArity() {
-    if( isNewSummary ) {
-      return (TokenTuple) Canonical.makeCanonical(
-               new TokenTuple(token, isNewSummary, ARITY_MANY)
-               );
+  public TokenTuple unionArity(TokenTuple tt) {
+    assert tt            != null;
+    assert token         == tt.token;
+    assert isMultiObject == tt.isMultiObject;
+
+    if( isMultiObject ) {
+      // for multiple objects only zero-or-mores combined are still zero-or-more
+      // when two tokens are present (absence of a token is arity=zero and is
+      // handled outside of this method)
+      if( arity == ARITY_ZEROORMORE && tt.arity == ARITY_ZEROORMORE ) {
+        return new TokenTuple(token, true, ARITY_ZEROORMORE).makeCanonical();
+      } else {
+        return new TokenTuple(token, true, ARITY_ONEORMORE).makeCanonical();
+      }
+
+    } else {
+      // a single object region's token can only have ZEROORMORE or ONE
+      if( arity == ARITY_ZEROORMORE && tt.arity == ARITY_ZEROORMORE ) {
+        return new TokenTuple(token, false, ARITY_ZEROORMORE).makeCanonical();
+      } else {
+        return new TokenTuple(token, false, ARITY_ONE).makeCanonical();
+      }
     }
-    return this;
   }
 
 
@@ -72,7 +101,7 @@ public class TokenTuple extends Canonical {
     assert tokenToChangeTo != null;
 
     return new TokenTuple(tokenToChangeTo,
-                          isNewSummary,
+                          isMultiObject,
                           arity).makeCanonical();
   }
 
@@ -89,23 +118,25 @@ public class TokenTuple extends Canonical {
     TokenTuple tt = (TokenTuple) o;
 
     return token.equals(tt.getToken() ) &&
-           arity ==      tt.getArity();
+           arity ==     tt.getArity();
   }
 
   public int hashCode() {
-    return token.intValue()*31 + arity;
+    return (token.intValue() << 2) ^ arity;
   }
 
 
   public String toString() {
     String s = token.toString();
 
-    if( isNewSummary ) {
-      s += "S";
+    if( isMultiObject ) {
+      s += "M";
     }
 
-    if( arity == ARITY_MANY ) {
+    if( arity == ARITY_ZEROORMORE ) {
       s += "*";
+    } else if( arity == ARITY_ONEORMORE ) {
+      s += "+";
     }
 
     return s;