run ooojava and rcrpointer that print out effects and annotate them with the source...

[IRC.git] / Robust / src / Analysis / Disjoint / CanonicalOp.java

diff --git a/Robust/src/Analysis/Disjoint/CanonicalOp.java b/Robust/src/Analysis/Disjoint/CanonicalOp.java
index 7de780c60cc2d833cd030ce0bc92dc2eb8138c53..26cbd5711c82770b8f6d08bf79b298a4964a76e4 100644 (file)
--- a/Robust/src/Analysis/Disjoint/CanonicalOp.java
+++ b/Robust/src/Analysis/Disjoint/CanonicalOp.java
@@ -1,6 +1,6 @@
 package Analysis.Disjoint;
 
-// a CanonicalOperation defines an operation on 
+// a CanonicalOperation defines an operation on
 // Canonical objects.  The Canonical class maps
 // an op to its result, so when you ask the
 // Canonical static methods to do an op that is
@@ -12,6 +12,7 @@ public class CanonicalOp {
   public static final int REACHSTATE_UNION_REACHSTATE          = 0x5678;
   public static final int REACHSTATE_ADD_REACHTUPLE            = 0x32b6;
   public static final int REACHSTATE_UNIONUPARITY_REACHSTATE   = 0x9152;
+  public static final int REACHSTATE_ADDUPARITY_REACHTUPLE     = 0x0a34;
   public static final int REACHSTATE_REMOVE_REACHTUPLE         = 0x8173;
   public static final int REACHSTATE_AGETUPLESFROM_ALLOCSITE   = 0x4f65;
   public static final int REACHSET_UNIONORPREDS_REACHSET       = 0x2131;
@@ -45,18 +46,18 @@ public class CanonicalOp {
   protected int opCode;
   protected Canonical operand1;
   protected Canonical operand2;
-  protected int       operand3;
+  protected int operand3;
 
-  public CanonicalOp( int       opc,
-                      Canonical op1, 
-                      Canonical op2 ) {
+  public CanonicalOp(int opc,
+                     Canonical op1,
+                     Canonical op2) {
     this( opc, op1, op2, PRIM_OP_UNUSED );
   }
 
-  public CanonicalOp( int       opc,
-                      Canonical op1, 
-                      Canonical op2,
-                      int       op3 ) {
+  public CanonicalOp(int opc,
+                     Canonical op1,
+                     Canonical op2,
+                     int op3) {
     assert op1.isCanonical();
     assert op2.isCanonical();
     opCode   = opc;
@@ -64,23 +65,23 @@ public class CanonicalOp {
     operand2 = op2;
     operand3 = op3;
   }
-  
+
   public int hashCode() {
     return opCode ^
-      (operand1.getCanonicalValue() << 2) ^
-      (operand2.getCanonicalValue() << 1) ^
-      (operand3 << 3);
+           (operand1.getCanonicalValue() << 2) ^
+           (operand2.getCanonicalValue() << 1) ^
+           (operand3 << 3);
   }
 
-  public boolean equals( Object o ) {
+  public boolean equals(Object o) {
     if( o == null ) {
       return false;
     }
 
     CanonicalOp co = (CanonicalOp) o;
     return opCode == co.opCode &&
-      (operand1.getCanonicalValue() == co.operand1.getCanonicalValue()) &&
-      (operand2.getCanonicalValue() == co.operand2.getCanonicalValue()) &&
-      operand3 == co.operand3;
+           (operand1.getCanonicalValue() == co.operand1.getCanonicalValue()) &&
+           (operand2.getCanonicalValue() == co.operand2.getCanonicalValue()) &&
+           operand3 == co.operand3;
   }
 }