From: bdemsky <bdemsky>
Date: Fri, 16 Apr 2004 21:13:37 +0000 (+0000)
Subject: Cristian bug fixes.
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=repair.git;a=commitdiff_plain;h=d4e442c8007f2bcb358b9dd4dcc642c451d462f5

Cristian bug fixes.
---

diff --git a/Repair/RepairCompiler/MCC/IR/RelationInclusion.java b/Repair/RepairCompiler/MCC/IR/RelationInclusion.java
index 58e2664..b31700c 100755
--- a/Repair/RepairCompiler/MCC/IR/RelationInclusion.java
+++ b/Repair/RepairCompiler/MCC/IR/RelationInclusion.java
@@ -88,7 +88,7 @@ public class RelationInclusion extends Inclusion {
         }
 
         String addeditem = (VarDescriptor.makeNew("addeditem")).getSafeSymbol();
-	if (!Compiler.REPAIR) {
+	/*	if (!Compiler.REPAIR) {
 	    writer.outputline("int " + addeditem + ";");
 	    if (relation.testUsage(RelationDescriptor.IMAGE)) {
 		writer.outputline(addeditem + " = " + relation.getSafeSymbol() + "_hash->add((int)" + ld.getSafeSymbol() + ", (int)" + rd.getSafeSymbol() + ");");
@@ -97,9 +97,9 @@ public class RelationInclusion extends Inclusion {
 	    if (relation.testUsage(RelationDescriptor.INVIMAGE)) {
 		writer.outputline(addeditem + " = " + relation.getSafeSymbol() + "_hashinv->add((int)" + rd.getSafeSymbol() + ", (int)" + ld.getSafeSymbol() + ");");
 	    }
-	} else {
+	    } else {*/
 	    Repair.generate_dispatch(writer, relation, ld.getSafeSymbol(), rd.getSafeSymbol());
-	}
+	    //	}
 	
         if (RelationInclusion.worklist) {
             writer.outputline("if (" + addeditem + ")");
diff --git a/Repair/RepairCompiler/MCC/IR/RepairGenerator.java b/Repair/RepairCompiler/MCC/IR/RepairGenerator.java
index ab4d026..fb78939 100755
--- a/Repair/RepairCompiler/MCC/IR/RepairGenerator.java
+++ b/Repair/RepairCompiler/MCC/IR/RepairGenerator.java
@@ -1392,8 +1392,7 @@ public class RepairGenerator {
 	    cr.outputline(addeditem + " = " + rd.getSafeSymbol() + "_hashinv->add((int)" + rightvar + ", (int)" + leftvar + ");");
 	}
 	
-	cr.outputline("if (" + addeditem + ")");
-	cr.startblock();
+
 
         Vector dispatchrules = getrulelist(rd);
         
@@ -1406,12 +1405,12 @@ public class RepairGenerator {
 	dispatchrules.removeAll(toremove);
         if (dispatchrules.size() == 0) {
             cr.outputline("// nothing to dispatch");
-	    cr.endblock();
             return;
         }
-       
-	cr.outputline("if ("+addeditem+")");
+
+	cr.outputline("if (" + addeditem + ")");
 	cr.startblock();
+       
         for(int i = 0; i < dispatchrules.size(); i++) {
             Rule rule = (Rule) dispatchrules.elementAt(i);
 	    if (rule.getGuardExpr().getRequiredDescriptors().contains(rd)) {
@@ -1427,7 +1426,7 @@ public class RepairGenerator {
 		}
 	    }
         }
-	cr.endblock();
+
 	cr.endblock();
     }
 
diff --git a/Repair/RepairCompiler/MCC/IR/SetInclusion.java b/Repair/RepairCompiler/MCC/IR/SetInclusion.java
index b18b08e..51a5113 100755
--- a/Repair/RepairCompiler/MCC/IR/SetInclusion.java
+++ b/Repair/RepairCompiler/MCC/IR/SetInclusion.java
@@ -64,13 +64,13 @@ public class SetInclusion extends Inclusion {
 
 
         if (dostore) {
-	    if (!Compiler.REPAIR) {
+	    /*	    if (!Compiler.REPAIR) {
 		writer.outputline("int " + addeditem + " = 1;");
 		writer.outputline(addeditem + " = " + set.getSafeSymbol() + "_hash->add((int)" + vd.getSafeSymbol() 
 				  +  ", (int)" + vd.getSafeSymbol() + ");");
-	    } else {
+				  } else {*/
 		Repair.generate_dispatch(writer, set, vd.getSafeSymbol());
-	    }
+		//	    }
 	    
             if (SetInclusion.worklist) {
                 writer.outputline("if (" + addeditem + ")");