X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=Repair%2FRepairCompiler%2FMCC%2FIR%2FImplicitSchema.java;h=4e34613b6feb95d3ca510c2c704ec631910ac048;hb=229b87c0fc246ff47b913673d33631a578dd5c3b;hp=1be006833b5a50bd199929d0175afd9f8a17e376;hpb=0ddd66cf596f161886dc67214f3fb2e19f6f7168;p=repair.git

diff --git a/Repair/RepairCompiler/MCC/IR/ImplicitSchema.java b/Repair/RepairCompiler/MCC/IR/ImplicitSchema.java
index 1be0068..4e34613 100755
--- a/Repair/RepairCompiler/MCC/IR/ImplicitSchema.java
+++ b/Repair/RepairCompiler/MCC/IR/ImplicitSchema.java
@@ -1,5 +1,7 @@
 package MCC.IR;
 import MCC.State;
+import MCC.Compiler;
+
 import java.util.*;
 
 public class ImplicitSchema {
@@ -11,7 +13,9 @@ public class ImplicitSchema {
     }
 
     public void update() {
-	//	updaterules();
+	if (Compiler.REPAIR) {
+	    updaterules();
+	}
 	updateconstraints();
 	updaterelationconstraints();
     }
@@ -23,6 +27,8 @@ public class ImplicitSchema {
     boolean needDR(RelationDescriptor rd,boolean isdomain) {
 	Vector rules=state.vRules;
 	SetDescriptor sd=isdomain?rd.getDomain():rd.getRange();
+	if (sd instanceof ReservedSetDescriptor)
+	    return false;
 	for(int i=0;i<rules.size();i++) {
 	    Rule r=(Rule)rules.get(i);
 	    if ((r.numQuantifiers()==1)&&
@@ -101,12 +107,11 @@ public class ImplicitSchema {
 	   1. match up quantifiers
 	   2. check inclusion condition
 	   3. see if guard expr of set rule is more general */
-
 	RelationInclusion inc1=(RelationInclusion) r1.getInclusion();
 	RelationDescriptor rd=inc1.getRelation();
 	SetDescriptor sd=isdomain?rd.getDomain():rd.getRange();
 	Expr expr=isdomain?inc1.getLeftExpr():inc1.getRightExpr();
-
+	
 	Inclusion inc2=r2.getInclusion();
 	if (!(inc2 instanceof SetInclusion))
 	    return false;
@@ -294,13 +299,15 @@ public class ImplicitSchema {
 		    for(Iterator superit=supersets.iterator();superit.hasNext();) {
 			SetDescriptor sd1=(SetDescriptor)superit.next();
 			Rule nr=new Rule();
-			nr.guard=r.guard;
+			nr.setGuardExpr(r.getGuardExpr());
 			nr.quantifiers=r.quantifiers;
 			nr.isstatic=r.isstatic;
 			nr.isdelay=r.isdelay;
 			nr.inclusion=new SetInclusion(((SetInclusion)r.inclusion).elementexpr,sd1);
 			nr.st=r.st;
+			nr.setnogenerate();
 			newrules.add(nr);
+			state.implicitrule.put(nr,r);
 		    }
 	    }
 	}