use unionUpArity in simple rewrite scenario also

diff --git a/Robust/src/Analysis/OwnershipAnalysis/TokenTupleSet.java b/Robust/src/Analysis/OwnershipAnalysis/TokenTupleSet.java
index 51e2124277f026ffa630f6dcf4c0dee177a6007f..c3acc46bbcf81176977794ff3298e714f8a60d9c 100644 (file)
--- a/Robust/src/Analysis/OwnershipAnalysis/TokenTupleSet.java
+++ b/Robust/src/Analysis/OwnershipAnalysis/TokenTupleSet.java
@@ -223,15 +223,13 @@ public class TokenTupleSet extends Canonical {
       Iterator<TokenTupleSet> replaceItr = replacements.iterator();
       while( replaceItr.hasNext() ) {
        TokenTupleSet replacement = replaceItr.next();
-       TokenTupleSet replaced = new TokenTupleSet();
-       replaced.tokenTuples.addAll( ttsMinusToken.tokenTuples );
-       replaced.tokenTuples.addAll( replacement.tokenTuples );
-       replaced = replaced.makeCanonical();
+       TokenTupleSet replaced = new TokenTupleSet( ttsMinusToken );
+       replaced = replaced.unionUpArity( replacement );
        rsOut = rsOut.add( replaced );
       }
     }
     
-    return rsOut;
+    return rsOut.makeCanonical();
   }