void generatedebuggraphs() {
for (int i=0;i<Compiler.debuggraphs.size();i++) {
DebugItem di=(DebugItem) Compiler.debuggraphs.get(i);
- Constraint constr=(Constraint)state.vConstraints.get(di.constraintnum);
HashSet superset=new HashSet();
- superset.addAll((Set)conjunctionmap.get(constr));
- HashSet closureset=new HashSet();
+ Constraint constr=(Constraint)state.vConstraints.get(di.constraintnum);
+
+ if (di.conjunctionnum==-1) {
+ superset.addAll((Set)conjunctionmap.get(constr));
+ } else {
+ DNFConstraint dnf=constr.dnfconstraint;
+ superset.add(conjtonodemap.get(dnf.get(di.conjunctionnum)));
+ }
- GraphNode.boundedcomputeclosure(superset,closureset,di.depth);
+ GraphNode.boundedcomputeclosure(superset,null,di.depth);
try {
- GraphNode.DOTVisitor.visit(new FileOutputStream("graph"+di.constraintnum+"-"+di.depth+".dot"),superset);
+ GraphNode.DOTVisitor.visit(new FileOutputStream("graph"+di.constraintnum+"-"+di.depth+(di.conjunctionnum==-1?"":"-"+di.conjunctionnum)+".dot"),superset);
} catch (Exception e) {
e.printStackTrace();
System.exit(-1);
conjunctionmap.put(c,new HashSet());
((Set)conjunctionmap.get(c)).add(gn);
conjtonodemap.put(dconst.get(0),gn);
-
}
}
}
}
}
}
-
/* Cycle through the rules to look for possible conflicts */
for(int i=0;i<state.vRules.size();i++) {
Rule r=(Rule) state.vRules.get(i);
TermNode tn2=(TermNode)gn2.getOwner();
Conjunction conj=tn2.getConjunction();
Constraint cons=tn2.getConstraint();
+ /* See if this is a relation wellformedness constraint
+ that is trivially satisfied. */
+ System.out.println(gn.getTextLabel()+"---"+gn2.getTextLabel());
+ if (abstractinterferes.checkrelationconstraint(ar, cons))
+ continue;
for(int i=0;i<conj.size();i++) {
DNFPredicate dp=conj.get(i);
- System.out.println("Checking "+gn.getTextLabel()+" --> "+gn2.getTextLabel());
- if (AbstractInterferes.interferes(ar,cons)||
- abstractinterferes.interferes(ar,dp)) {
+ if (AbstractInterferes.interferesquantifier(ar,cons)||
+ abstractinterferes.interfereswithpredicate(ar,dp)) {
GraphNode.Edge e=new GraphNode.Edge("interferes",gn2);
gn.addEdge(e);
break;
}
}
}
-
for(Iterator scopeiterator=scopenodes.iterator();scopeiterator.hasNext();) {
GraphNode gn2=(GraphNode)scopeiterator.next();
TermNode tn2=(TermNode)gn2.getOwner();
ScopeNode sn2=tn2.getScope();
- if (AbstractInterferes.interferes(ar,sn2.getRule(),sn2.getSatisfy())) {
+ if (AbstractInterferes.interfereswithrule(ar,sn2.getRule(),sn2.getSatisfy())) {
GraphNode.Edge e=new GraphNode.Edge("interferes",gn2);
gn.addEdge(e);
}
Constraint constr=tn2.getConstraint();
for(int i=0;i<conj.size();i++) {
DNFPredicate dp=conj.get(i);
- if (abstractinterferes.interferes(sn,dp)||
- AbstractInterferes.interferes(sn.getDescriptor(),sn.getSatisfy(),constr)) {
+ if (abstractinterferes.scopeinterfereswithpredicate(sn,dp)||
+ AbstractInterferes.interfereswithquantifier(sn.getDescriptor(),sn.getSatisfy(),constr)) {
GraphNode.Edge e=new GraphNode.Edge("interferes",gn2);
GraphNode gnconseq=(GraphNode)consequence.get(sn);
gnconseq.addEdge(e);
/* Now see if this could effect other model defintion rules */
for(int i=0;i<state.vRules.size();i++) {
Rule r=(Rule) state.vRules.get(i);
- if (AbstractInterferes.interferes(sn.getDescriptor(),sn.getSatisfy(),r,true)) {
+ if (AbstractInterferes.interfereswithrule(sn.getDescriptor(),sn.getSatisfy(),r,true)) {
GraphNode scopenode=(GraphNode)scopesatisfy.get(r);
GraphNode.Edge e=new GraphNode.Edge("interferes",scopenode);
GraphNode gnconseq=(GraphNode)consequence.get(sn);
gnconseq.addEdge(e);
}
- if (AbstractInterferes.interferes(sn.getDescriptor(),sn.getSatisfy(),r,false)) {
+ if (AbstractInterferes.interfereswithrule(sn.getDescriptor(),sn.getSatisfy(),r,false)) {
GraphNode scopenode=(GraphNode)scopefalsify.get(r);
GraphNode.Edge e=new GraphNode.Edge("interferes",scopenode);
GraphNode gnconseq=(GraphNode)consequence.get(sn);
void generatedatastructureupdatenodes() {
for(Iterator absiterator=abstractrepair.iterator();absiterator.hasNext();) {
GraphNode gn=(GraphNode)absiterator.next();
+ System.out.println("Analysing: "+gn.getTextLabel());
TermNode tn=(TermNode) gn.getOwner();
AbstractRepair ar=tn.getAbstract();
if (ar.getType()==AbstractRepair.ADDTOSET) {
generateremovefromsetrelation(gn,ar);
} else if (ar.getType()==AbstractRepair.MODIFYRELATION) {
/* Generate remove/add pairs */
- generateremovefromsetrelation(gn,ar);
+ if (ar.needsRemoves(state))
+ generateremovefromsetrelation(gn,ar);
generateaddtosetrelation(gn,ar);
/* Generate atomic modify */
generatemodifyrelation(gn,ar);
/* Construct bindings */
Hashtable setmapping=new Hashtable();
+ System.out.println("Attempting to construct bindings");
if (!constructbindings(bindings,r,ar,setmapping,false))
continue;
+ System.out.println("Bindings constructed");
//Generate add instruction
DNFRule dnfrule=r.getDNFGuardExpr();
+ endloop:
for(int j=0;j<dnfrule.size();j++) {
Inclusion inc=r.getInclusion();
UpdateNode un=new UpdateNode(r);
/* Now build update for tuple/set inclusion condition */
if(inc instanceof SetInclusion) {
SetInclusion si=(SetInclusion)inc;
- if (!(si.elementexpr instanceof VarExpr)) {
- if (si.elementexpr.isValue(si.getSet().getType())) {
- Updates up=new Updates(si.elementexpr,0,si.getSet().getType());
+ Expr e=si.elementexpr;
+
+ while(e instanceof CastExpr) {
+ CastExpr ce=(CastExpr)e;
+ if (ce.getType()!=si.getSet().getType())
+ continue endloop;
+ e=ce.getExpr();
+ }
+
+ if (!(e instanceof VarExpr)) {
+ if (e.isValue(si.getSet().getType())) {
+ Updates up=new Updates(e,0,si.getSet().getType());
un.addUpdate(up);
} else {
/* We're an add to set*/
- System.out.println("Rule: "+r);
- ArrayAnalysis.AccessPath rap=arrayanalysis.analyzeExpr(r,si.elementexpr);
- System.out.println("Attempting perform array add");
+ ArrayAnalysis.AccessPath rap=arrayanalysis.analyzeExpr(r,e);
SetDescriptor set=sources.setSource(si.getSet())?
sources.getSourceSet(si.getSet()):null;
if (set==null)
continue;
- System.out.println("Non-null source set");
ArrayAnalysis.AccessPath ap=arrayanalysis.getSet(set);
if (rap==ArrayAnalysis.AccessPath.NONE)
continue;
- System.out.println("A");
if (!rap.equal(ap))
continue;
- System.out.println("B");
- if (!constructarrayupdate(un, si.elementexpr, rap, 0))
+ if (!constructarrayupdate(un, e, rap, 0))
continue;
- System.out.println("C");
}
} else {
- VarDescriptor vd=((VarExpr)si.elementexpr).getVar();
+ VarDescriptor vd=((VarExpr)e).getVar();
if (vd.isGlobal()) {
- Updates up=new Updates(si.elementexpr,0,null);
+ Updates up=new Updates(e,0,null);
un.addUpdate(up);
}
}
} else if (inc instanceof RelationInclusion) {
RelationInclusion ri=(RelationInclusion)inc;
- if (!(ri.getLeftExpr() instanceof VarExpr)) {
- if (ri.getLeftExpr().isValue(ri.getRelation().getDomain().getType())) {
- Updates up=new Updates(ri.getLeftExpr(),0,ri.getRelation().getDomain().getType());
+
+ Expr e=ri.getLeftExpr();
+
+ while(e instanceof CastExpr) {
+ CastExpr ce=(CastExpr)e;
+ if (ce.getType()!=ri.getRelation().getDomain().getType())
+ continue endloop;
+ e=ce.getExpr();
+ }
+ if (!(e instanceof VarExpr)) {
+ if (e.isValue(ri.getRelation().getDomain().getType())) {
+ Updates up=new Updates(e,0,ri.getRelation().getDomain().getType());
if (ar.getDomainSet()!=null)
- setmapping.put(ri.getLeftExpr(),ar.getDomainSet());
+ setmapping.put(e,ar.getDomainSet());
un.addUpdate(up);
} else {
/* We don't handly relation modifies */
if (ar.getType()==AbstractRepair.MODIFYRELATION)
continue;
/* We're an add to relation*/
- ArrayAnalysis.AccessPath rap=arrayanalysis.analyzeExpr(r,ri.getLeftExpr());
+ ArrayAnalysis.AccessPath rap=arrayanalysis.analyzeExpr(r,e);
SetDescriptor set=sources.relsetSource(ri.getRelation(),true /* Domain*/)?
sources.relgetSourceSet(ri.getRelation(),true):null;
if (set==null)
ArrayAnalysis.AccessPath ap=arrayanalysis.getSet(set);
if (rap==ArrayAnalysis.AccessPath.NONE||
!rap.equal(ap)||
- !constructarrayupdate(un, ri.getLeftExpr(), rap, 0))
+ !constructarrayupdate(un, e, rap, 0))
continue;
if (ar.getDomainSet()!=null)
- setmapping.put(ri.getLeftExpr(),ar.getDomainSet());
+ setmapping.put(e,ar.getDomainSet());
}
} else {
- VarDescriptor vd=((VarExpr)ri.getLeftExpr()).getVar();
+ VarDescriptor vd=((VarExpr)e).getVar();
if (vd.isGlobal()) {
- Updates up=new Updates(ri.getLeftExpr(),0,null);
+ Updates up=new Updates(e,0,null);
if (ar.getDomainSet()!=null)
- setmapping.put(ri.getLeftExpr(),ar.getDomainSet());
+ setmapping.put(e,ar.getDomainSet());
un.addUpdate(up);
}
}
- if (!(ri.getRightExpr() instanceof VarExpr)) {
- if (ri.getRightExpr().isValue(ri.getRelation().getRange().getType())) {
- Updates up=new Updates(ri.getRightExpr(),1,ri.getRelation().getRange().getType());
+
+ e=ri.getRightExpr();
+
+ while(e instanceof CastExpr) {
+ CastExpr ce=(CastExpr)e;
+ if (ce.getType()!=ri.getRelation().getRange().getType())
+ continue endloop;
+ e=ce.getExpr();
+ }
+ if (!(e instanceof VarExpr)) {
+ if (e.isValue(ri.getRelation().getRange().getType())) {
+ Updates up=new Updates(e,1,ri.getRelation().getRange().getType());
un.addUpdate(up);
} else {
/* We don't handly relation modifies */
if (ar.getType()==AbstractRepair.MODIFYRELATION)
continue;
/* We're an add to relation*/
- ArrayAnalysis.AccessPath rap=arrayanalysis.analyzeExpr(r,ri.getRightExpr());
+ ArrayAnalysis.AccessPath rap=arrayanalysis.analyzeExpr(r,e);
SetDescriptor set=sources.relsetSource(ri.getRelation(),false /* Range*/)?
sources.relgetSourceSet(ri.getRelation(),false):null;
if (set==null)
if (rap==ArrayAnalysis.AccessPath.NONE||
!rap.equal(ap)||
- !constructarrayupdate(un, ri.getRightExpr(), rap, 1))
+ !constructarrayupdate(un, e, rap, 1))
continue;
if (ar.getRangeSet()!=null)
- setmapping.put(ri.getRightExpr(),ar.getRangeSet());
+ setmapping.put(e,ar.getRangeSet());
}
} else {
- VarDescriptor vd=((VarExpr)ri.getRightExpr()).getVar();
+ VarDescriptor vd=((VarExpr)e).getVar();
if (vd.isGlobal()) {
- Updates up=new Updates(ri.getRightExpr(),1,null);
+ Updates up=new Updates(e,1,null);
if (ar.getRangeSet()!=null)
- setmapping.put(ri.getRightExpr(),ar.getRangeSet());
+ setmapping.put(e,ar.getRangeSet());
un.addUpdate(up);
}
}
}
+ System.out.println("Built inclusion condition updates.");
//Finally build necessary updates to satisfy conjunction
RuleConjunction ruleconj=dnfrule.get(j);
TermNode tn=new TermNode(mun);
GraphNode gn2=new GraphNode("UpdateAdd"+addtocount,tn);
- if (processquantifiers(gn2,un, r,setmapping)&&
+ if (debugmsg("Start processing quantifiers")&&
+ processquantifiers(gn2,un, r,setmapping)&&
+ debugmsg("Finished processing quantifiers")&&
processconjunction(un,ruleconj,setmapping)&&
- un.checkupdates()) {
+ debugmsg("Finished processing conjunction")&&
+ un.checkupdates()&&
+ debugmsg("Updates checked")) {
mun.addUpdate(un);
GraphNode.Edge e=new GraphNode.Edge("abstract"+addtocount,gn2);
addtocount++;
}
}
+ boolean debugmsg(String st) {
+ System.out.println(st);
+ return true;
+ }
+
boolean constructarrayupdate(UpdateNode un, Expr lexpr, ArrayAnalysis.AccessPath ap, int slotnumber) {
System.out.println("Constructing array update");
Expr e=null;
}
if(inc instanceof SetInclusion) {
SetInclusion si=(SetInclusion)inc;
- if ((si.elementexpr instanceof VarExpr)&&
- (((VarExpr)si.elementexpr).getVar()==vd)) {
+ Expr tmpe=si.elementexpr;
+ Expr e=si.elementexpr;
+
+ while(e instanceof CastExpr) {
+ CastExpr ce=(CastExpr)e;
+ if (ce.getType()!=si.getSet().getType())
+ return false;
+ e=ce.getExpr();
+ }
+
+ if ((e instanceof VarExpr)&&
+ (((VarExpr)e).getVar()==vd)) {
/* Can solve for v */
+ if (!si.getSet().getType().isSubtypeOf(set.getType()))
+ return false;
Binding binding=new Binding(vd,0);
bindings.add(binding);
} else {
RelationInclusion ri=(RelationInclusion)inc;
boolean f1=true;
boolean f2=true;
- if ((ri.getLeftExpr() instanceof VarExpr)&&
- (((VarExpr)ri.getLeftExpr()).getVar()==vd)) {
+
+ Expr e=ri.getLeftExpr();
+
+ while(e instanceof CastExpr) {
+ CastExpr ce=(CastExpr)e;
+ if (ce.getType()!=ri.getRelation().getDomain().getType())
+ return false;
+ e=ce.getExpr();
+ }
+
+ if ((e instanceof VarExpr)&&
+ (((VarExpr)e).getVar()==vd)) {
/* Can solve for v */
Binding binding=new Binding(vd,0);
+ if (!ri.getRelation().getDomain().getType().isSubtypeOf(set.getType()))
+ return false;
if (ar.getDomainSet()!=null)
setmapping.put(ri.getLeftExpr(),ar.getDomainSet());
bindings.add(binding);
} else f1=false;
- if ((ri.getRightExpr() instanceof VarExpr)&&
- (((VarExpr)ri.getRightExpr()).getVar()==vd)) {
+
+
+ e=ri.getRightExpr();
+
+ while(e instanceof CastExpr) {
+ CastExpr ce=(CastExpr)e;
+ if (ce.getType()!=ri.getRelation().getRange().getType())
+ return false;
+ e=ce.getExpr();
+ }
+
+ if ((e instanceof VarExpr)&&
+ (((VarExpr)e).getVar()==vd)) {
/* Can solve for v */
- Binding binding=new Binding(vd,0);
+ Binding binding=new Binding(vd,1);
+ if (!ri.getRelation().getRange().getType().isSubtypeOf(set.getType()))
+ return false;
if (ar.getRangeSet()!=null)
setmapping.put(ri.getRightExpr(),ar.getRangeSet());
bindings.add(binding);
RelationQuantifier rq=(RelationQuantifier)q;
for(int k=0;k<2;k++) {
VarDescriptor vd=(k==0)?rq.x:rq.y;
+ TypeDescriptor td=(k==0)?rq.getRelation().getDomain().getType():rq.getRelation().getRange().getType();
if(inc instanceof SetInclusion) {
SetInclusion si=(SetInclusion)inc;
- if ((si.elementexpr instanceof VarExpr)&&
- (((VarExpr)si.elementexpr).getVar()==vd)) {
+
+ Expr e=si.elementexpr;
+
+ while(e instanceof CastExpr) {
+ CastExpr ce=(CastExpr)e;
+ if (ce.getType()!=td)
+ return false;
+ e=ce.getExpr();
+ }
+
+ if ((e instanceof VarExpr)&&
+ (((VarExpr)e).getVar()==vd)) {
/* Can solve for v */
Binding binding=new Binding(vd,0);
+
+ if (!si.getSet().getType().isSubtypeOf(td))
+ return false;
bindings.add(binding);
} else
goodupdate=false;
RelationInclusion ri=(RelationInclusion)inc;
boolean f1=true;
boolean f2=true;
+
+
+ Expr e=ri.getLeftExpr();
+
+ while(e instanceof CastExpr) {
+ CastExpr ce=(CastExpr)e;
+ if (ce.getType()!=ri.getRelation().getDomain().getType())
+ return false;
+ e=ce.getExpr();
+ }
if ((ri.getLeftExpr() instanceof VarExpr)&&
(((VarExpr)ri.getLeftExpr()).getVar()==vd)) {
/* Can solve for v */
Binding binding=new Binding(vd,0);
+ if (!ri.getRelation().getDomain().getType().isSubtypeOf(td))
+ return false;
if (ar.getDomainSet()!=null)
setmapping.put(ri.getLeftExpr(),ar.getDomainSet());
bindings.add(binding);
} else f1=false;
+
+
+ e=ri.getRightExpr();
+
+ while(e instanceof CastExpr) {
+ CastExpr ce=(CastExpr)e;
+ if (ce.getType()!=ri.getRelation().getRange().getType())
+ return false;
+ e=ce.getExpr();
+ }
if ((ri.getRightExpr() instanceof VarExpr)&&
(((VarExpr)ri.getRightExpr()).getVar()==vd)) {
/* Can solve for v */
- Binding binding=new Binding(vd,0);
+ Binding binding=new Binding(vd,1);
+ if (!ri.getRelation().getRange().getType().isSubtypeOf(td))
+ return false;
if (ar.getRangeSet()!=null)
setmapping.put(ri.getRightExpr(),ar.getRangeSet());
bindings.add(binding);
for(Iterator iterator=r.quantifiers();iterator.hasNext();) {
Quantifier q=(Quantifier)iterator.next();
/* Add quantifier */
- /* FIXME: Analysis to determine when this update is necessary */
if (q instanceof RelationQuantifier) {
RelationQuantifier rq=(RelationQuantifier)q;
TupleOfExpr toe=new TupleOfExpr(new VarExpr(rq.x),new VarExpr(rq.y),rq.relation);
} else {
return false;
}
-
} else if (q instanceof SetQuantifier) {
SetQuantifier sq=(SetQuantifier)q;
if (un.getBinding(sq.var).getType()==Binding.SEARCH) {
return okay;
}
+ /** This method sees if when the quantifiers listed in set are
+ * fixed, whether there can be more than one unique binding for
+ * the constraint or model definition rule qs.*/
public boolean analyzeQuantifiers(Quantifiers qs,Set set) {
for(int i=0;i<qs.numQuantifiers();i++) {
Quantifier q=qs.getQuantifier(i);
projects / repair.git / blobdiff