1) Added useDescriptor method to Expr's.

[repair.git] / Repair / RepairCompiler / MCC / IR / RelationExpr.java

diff --git a/Repair/RepairCompiler/MCC/IR/RelationExpr.java b/Repair/RepairCompiler/MCC/IR/RelationExpr.java
index b966628be324d52be7701c935b1172ed867a7d02..def95760ec410a02395af921ecd83525c7a797ed 100755 (executable)
--- a/Repair/RepairCompiler/MCC/IR/RelationExpr.java
+++ b/Repair/RepairCompiler/MCC/IR/RelationExpr.java
@@ -8,12 +8,93 @@ public class RelationExpr extends Expr {
     RelationDescriptor relation;
     boolean inverse;
 
+    public Set getfunctions() {
+       HashSet functions=new HashSet();
+       Set exprfunctions=expr.getfunctions();
+       if (exprfunctions!=null)
+           functions.addAll(exprfunctions);
+       functions.add(new ConstraintDependence.Function(relation,expr.getSet(),inverse));
+       
+       return functions;
+    }
+
+    public SetDescriptor getSet() {
+       if (inverse)
+           return relation.domain;
+       else
+           return relation.range;
+    }
+
     public RelationExpr(Expr expr, RelationDescriptor relation, boolean inverse) {
         this.expr = expr;
         this.relation = relation;
         this.inverse = inverse;
     }
 
+    public Set freeVars() {
+       return expr.freeVars();
+    }
+
+    public String name() {
+       String name=expr.name()+".";
+       if (inverse)
+           name+="~";
+       name+=relation.toString();
+       return name;
+    }
+
+    public Expr getExpr() {
+        return expr;
+    }
+
+    public boolean equals(Map remap, Expr e) {
+       if (e==null||!(e instanceof RelationExpr))
+           return false;
+       RelationExpr re=(RelationExpr)e;
+       if (re.relation!=relation)
+           return false;
+       if (!expr.equals(remap,re.expr))
+           return false;
+       if (inverse!=re.inverse)
+           return false;
+       return true;
+    }
+
+    public boolean usesDescriptor(Descriptor rd) {
+       if (rd==relation)
+           return true;
+       else
+           return expr.usesDescriptor(rd);
+    }
+
+    public Set useDescriptor(Descriptor rd) {
+       HashSet newset=new HashSet();
+       if (rd==relation)
+           newset.add(this);
+       newset.addAll(expr.useDescriptor(rd));
+       return newset;
+    }
+    
+    public RelationDescriptor getRelation() {
+        return relation;
+    }
+
+    public Descriptor getDescriptor() {
+        return relation;
+    }
+
+    public boolean inverted() {
+        return inverse;
+    }
+
+    public Set getInversedRelations() {
+        Set set = expr.getInversedRelations();
+        if (inverse) {
+            set.add(relation);
+        }
+        return set;
+    }
+
     public Set getRequiredDescriptors() {
         Set v = expr.getRequiredDescriptors();        
         v.add(relation);
@@ -22,15 +103,22 @@ public class RelationExpr extends Expr {
 
     public void generate(CodeWriter writer, VarDescriptor dest) {
         VarDescriptor domain = VarDescriptor.makeNew("domain");
+        String strinverse = inverse ? "inv" : "";
+        String found = (VarDescriptor.makeNew("found")).getSafeSymbol();
         expr.generate(writer, domain);
-        writer.outputline(relation.getRange().getType().getSafeSymbol() + " " + dest.getSymbol() + " = " + relation.getSafeSymbol() + "_hash->get(" + domain.getSafeSymbol() + ");");
+        writer.outputline(relation.getRange().getType().getGenerateType().getSafeSymbol() + " " + dest.getSafeSymbol() + ";");
+        writer.outputline("int " + found + " = " + relation.getSafeSymbol() + "_hash" + strinverse + "->get(" + domain.getSafeSymbol() + ", " + dest.getSafeSymbol() + ");");
+        writer.outputline("if (!" + found + ") { maybe = 1; }");
     }
 
-    public void generate_set(CodeWriter writer, VarDescriptor dest) {
-        VarDescriptor domain = VarDescriptor.makeNew("domain");
-        expr.generate(writer, domain);
-        writer.outputline(relation.getRange().getType().getSafeSymbol() + " " + dest.getSymbol() + " = " + relation.getSafeSymbol() + "_hash->get(" + domain.getSafeSymbol() + ");");
-    }
+    // #TBD#: don't think this method is needed (or even called/referenced)
+    /*
+      public void generate_set(CodeWriter writer, VarDescriptor dest) {
+      VarDescriptor domain = VarDescriptor.makeNew("domain");
+      expr.generate(writer, domain);
+      writer.outputline(relation.getRange().getType().getGenerateType().getSafeSymbol() + " " + dest.getSafeSymbol() + " = " + relation.getSafeSymbol() + "_hash->get(" + domain.getSafeSymbol() + ");");
+      }
+    */
 
     public void prettyPrint(PrettyPrinter pp) {
         expr.prettyPrint(pp);
@@ -57,7 +145,7 @@ public class RelationExpr extends Expr {
             
             if (rangetype != type) {
                 sa.getErrorReporter().report(null, "Type of left side of relation operator '.' is '" + type.getSymbol() + 
-                                    "' but must be the '" + rangetype.getSymbol() + 
+                                    "' but must be '" + rangetype.getSymbol() + 
                                     "', the type of the range of the relation '" + relation.getSymbol() + "'");
                 return null;
             }
@@ -69,8 +157,8 @@ public class RelationExpr extends Expr {
             
             if (domaintype != type) {
                 sa.getErrorReporter().report(null, "Type of left side of relation operator '.' is '" + type.getSymbol() + 
-                                    "' but must be the '" + domaintype.getSymbol() + 
-                                    "', the type of the range of the relation '" + relation.getSymbol() + "'");
+                                    "' but must be '" + domaintype.getSymbol() + 
+                                    "', the type of the domain of the relation '" + relation.getSymbol() + "'");
                 return null;
             }