Checking in changes that:

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

diff --git a/Repair/RepairCompiler/MCC/IR/RelationQuantifier.java b/Repair/RepairCompiler/MCC/IR/RelationQuantifier.java
index 48959afc7e426a9fee455214ce83c0cef10fdf27..e759aa768c65466753e188dcfc6bbc7cf863bcdf 100755 (executable)
--- a/Repair/RepairCompiler/MCC/IR/RelationQuantifier.java
+++ b/Repair/RepairCompiler/MCC/IR/RelationQuantifier.java
@@ -10,7 +10,7 @@ public class RelationQuantifier extends Quantifier {
     public RelationQuantifier() {}
 
     public void setRelation(RelationDescriptor rd) {
-        relation = rd; 
+        relation = rd;
     }
 
     public RelationDescriptor getRelation() {
@@ -33,22 +33,22 @@ public class RelationQuantifier extends Quantifier {
     }
 
     public void generate_open(CodeWriter writer) {
-       writer.outputline("SimpleIterator "+x.getSafeSymbol()+"_iterator;");
-        writer.outputline("for ("+relation.getSafeSymbol() + "_hash->iterator("+x.getSafeSymbol()+"_iterator); " + x.getSafeSymbol() + "_iterator.hasNext(); )");
+       writer.outputline("struct SimpleIterator "+x.getSafeSymbol()+"_iterator;");
+        writer.outputline("for (SimpleHashiterator("+relation.getSafeSymbol()+"_hash, "+x.getSafeSymbol()+"_iterator); hasNext("+x.getSafeSymbol()+"_iterator); )");
         writer.startblock();
-        writer.outputline(y.getType().getGenerateType() + " " + y.getSafeSymbol() + " = (" + y.getType().getGenerateType() + ") " + x.getSafeSymbol() + "_iterator.next();");        
-        // #ATTN#: key is called second because next() forwards ptr and key does not! 
-        writer.outputline(x.getType().getGenerateType() + " " + x.getSafeSymbol() + " = (" + x.getType().getGenerateType() + ") " + x.getSafeSymbol() + "_iterator.key();");
+        writer.outputline(y.getType().getGenerateType() + " " + y.getSafeSymbol() + " = (" + y.getType().getGenerateType() + ") next("+x.getSafeSymbol()+"_iterator);");
+        // #ATTN#: key is called second because next() forwards ptr and key does not!
+        writer.outputline(x.getType().getGenerateType() + " " + x.getSafeSymbol() + " = (" + x.getType().getGenerateType() + ") key("+x.getSafeSymbol()+"_iterator);");
     }
 
     public void generate_open(CodeWriter writer, String type,int number, String left,String right) {
        VarDescriptor tmp=VarDescriptor.makeNew("flag");
-        writer.outputline("SimpleIterator* " + x.getSafeSymbol() + "_iterator = " + relation.getSafeSymbol() + "_hash->iterator();");
+        writer.outputline("struct SimpleIterator * " + x.getSafeSymbol() + "_iterator = SimpleHashcreateiterator("+relation.getSafeSymbol()+"_hash);");
        writer.outputline("int "+tmp.getSafeSymbol()+"=0;");
        writer.outputline("if ("+type+"=="+number+")");
        writer.outputline(tmp.getSafeSymbol()+"=1;");
-       
-       writer.outputline("while("+tmp.getSafeSymbol()+"||(("+type+"!="+number+")&&"+x.getSafeSymbol() + "_iterator->hasNext()))");
+
+       writer.outputline("while("+tmp.getSafeSymbol()+"||(("+type+"!="+number+")&& hasNext("+x.getSafeSymbol()+"_iterator)))");
         writer.startblock();
         writer.outputline(x.getType().getGenerateType() + " " + x.getSafeSymbol() + ";");
         writer.outputline(y.getType().getGenerateType() + " " + y.getSafeSymbol() + ";");
@@ -60,25 +60,25 @@ public class RelationQuantifier extends Quantifier {
        writer.endblock();
        writer.outputline("else");
        writer.startblock();
-        writer.outputline(y.getSafeSymbol() + " = (" + y.getType().getGenerateType() + ") " + x.getSafeSymbol() + "_iterator->next();");        
-        writer.outputline(x.getSafeSymbol() + " = (" + x.getType().getGenerateType() + ") " + x.getSafeSymbol() + "_iterator->key();");
+        writer.outputline(y.getSafeSymbol() + " = (" + y.getType().getGenerateType() + ") next("+x.getSafeSymbol()+"_iterator);");
+        writer.outputline(x.getSafeSymbol() + " = (" + x.getType().getGenerateType() + ") key("+x.getSafeSymbol()+"_iterator);");
        writer.endblock();
     }
 
-    public int generate_worklistload(CodeWriter writer, int offset) {        
+    public int generate_worklistload(CodeWriter writer, int offset) {
         String varx = x.getSafeSymbol();
         String vary = y.getSafeSymbol();
-        writer.outputline("int " + varx + " = wi->word" + offset + "; // r1"); 
-        writer.outputline("int " + vary + " = wi->word" + (offset + 1) + "; //r2"); 
-        return offset + 2;       
+        writer.outputline("int " + varx + " = wi->word" + offset + "; /* r1*/");
+        writer.outputline("int " + vary + " = wi->word" + (offset + 1) + "; /*r2*/");
+        return offset + 2;
     }
 
-    public int generate_workliststore(CodeWriter writer, int offset) {        
+    public int generate_workliststore(CodeWriter writer, int offset) {
         String varx = x.getSafeSymbol();
         String vary = y.getSafeSymbol();
-        writer.outputline("wi->word" + offset + " = " + varx + "; // r1");
-        writer.outputline("wi->word" + (offset+1) + " = " + vary + "; // r2");
-        return offset + 2;       
+        writer.outputline("wi->word" + offset + " = " + varx + "; /* r1*/");
+        writer.outputline("wi->word" + (offset+1) + " = " + vary + "; /* r2*/");
+        return offset + 2;
     }