major revisions on FlowGraph to have more precise information

[IRC.git] / Robust / src / Analysis / OwnershipAnalysis / TokenTuple.java

diff --git a/Robust/src/Analysis/OwnershipAnalysis/TokenTuple.java b/Robust/src/Analysis/OwnershipAnalysis/TokenTuple.java
index 06eb4503e1d78aeb5a16d000cb991d16eaaa18f8..00d9561a2fe6238a03ae574d55a5575af24c1c94 100644 (file)
--- a/Robust/src/Analysis/OwnershipAnalysis/TokenTuple.java
+++ b/Robust/src/Analysis/OwnershipAnalysis/TokenTuple.java
@@ -43,13 +43,13 @@ public class TokenTuple extends Canonical {
   }
 
   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;
-      }
+    //This is an evil hack...we should fix this stuff elsewhere...
+    if (!isMultiObject) {
+      arity=ARITY_ONE;
+    } else {
+      if (arity==ARITY_ONEORMORE)
+        arity=ARITY_ZEROORMORE;
+    }
   }
 
 
@@ -81,17 +81,17 @@ public class TokenTuple extends Canonical {
       // 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();
+        return new TokenTuple(token, true, ARITY_ZEROORMORE).makeCanonical();
       } else {
-       return new TokenTuple(token, true, ARITY_ONEORMORE).makeCanonical();
+        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();
+        return new TokenTuple(token, false, ARITY_ZEROORMORE).makeCanonical();
       } else {
-       return new TokenTuple(token, false, ARITY_ONE).makeCanonical();
+        return new TokenTuple(token, false, ARITY_ONE).makeCanonical();
       }
     }
   }
@@ -122,7 +122,7 @@ public class TokenTuple extends Canonical {
   }
 
   public int hashCode() {
-      return (token.intValue() << 2) ^ arity;
+    return (token.intValue() << 2) ^ arity;
   }