Checking in changes that:

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

diff --git a/Repair/RepairCompiler/MCC/IR/SetQuantifier.java b/Repair/RepairCompiler/MCC/IR/SetQuantifier.java
index 379a5099a57adaa1daa7c057ea251ba3d1231662..d17505eeb96620d141df54f4278b69bcf16fb47f 100755 (executable)
--- a/Repair/RepairCompiler/MCC/IR/SetQuantifier.java
+++ b/Repair/RepairCompiler/MCC/IR/SetQuantifier.java
@@ -38,21 +38,21 @@ public class SetQuantifier extends Quantifier {
     }
 
     public void generate_open(CodeWriter writer) {
-       writer.outputline("SimpleIterator "+var.getSafeSymbol()+"_iterator;");
-        writer.outputline("for (" + set.getSafeSymbol() + "_hash->iterator("+var.getSafeSymbol()+"_iterator); " + var.getSafeSymbol() + "_iterator.hasNext(); )");
+       writer.outputline("struct SimpleIterator "+var.getSafeSymbol()+"_iterator;");
+        writer.outputline("for (SimpleHashiterator("+set.getSafeSymbol()+"_hash, & "+ var.getSafeSymbol()+"_iterator); hasNext(&"+var.getSafeSymbol()+"_iterator); )");
         writer.startblock();
-        writer.outputline(var.getType().getGenerateType() + " " + var.getSafeSymbol() + " = (" + var.getType().getGenerateType() + ") " + var.getSafeSymbol() + "_iterator.next();");
+        writer.outputline(var.getType().getGenerateType() + " " + var.getSafeSymbol() + " = (" + var.getType().getGenerateType() + ") next(&"+var.getSafeSymbol()+"_iterator);");
     }
-  
+
     public void generate_open(CodeWriter writer, String type,int number, String left,String right) {
        VarDescriptor tmp=VarDescriptor.makeNew("flag");
-       writer.outputline("SimpleIterator "+var.getSafeSymbol()+"_iterator;");
-        writer.outputline(set.getSafeSymbol() + "_hash->iterator("+var.getSafeSymbol()+"_iterator);");
+       writer.outputline("struct SimpleIterator "+var.getSafeSymbol()+"_iterator;");
+        writer.outputline("SimpleHashiterator("+set.getSafeSymbol()+"_hash, &"+var.getSafeSymbol()+"_iterator);");
        writer.outputline("int "+tmp.getSafeSymbol()+"=0;");
        writer.outputline("if ("+type+"=="+number+")");
        writer.outputline(tmp.getSafeSymbol()+"=1;");
 
-       writer.outputline("while("+tmp.getSafeSymbol()+"||(("+type+"!="+number+")&&"+var.getSafeSymbol() + "_iterator.hasNext()))");
+       writer.outputline("while("+tmp.getSafeSymbol()+"||(("+type+"!="+number+")&&hasNext(&"+var.getSafeSymbol()+"_iterator)))");
         writer.startblock();
         writer.outputline(var.getType().getGenerateType() + " " + var.getSafeSymbol() + ";");
        writer.outputline("if ("+type+"=="+number+")");
@@ -61,19 +61,19 @@ public class SetQuantifier extends Quantifier {
         writer.outputline(var.getSafeSymbol() + " = (" + var.getType().getGenerateType() + ") " + left + ";");
        writer.endblock();
        writer.outputline("else");
-        writer.outputline(var.getSafeSymbol() + " = (" + var.getType().getGenerateType() + ") " + var.getSafeSymbol() + "_iterator.next();");
+        writer.outputline(var.getSafeSymbol() + " = (" + var.getType().getGenerateType() + ") next(&"+var.getSafeSymbol()+"_iterator);");
     }
-  
-    public int generate_worklistload(CodeWriter writer, int offset) {        
+
+    public int generate_worklistload(CodeWriter writer, int offset) {
         String varname = var.getSafeSymbol();
-        writer.outputline("int " + varname + " = wi->word" + offset + ";"); 
-        return offset + 1;       
+        writer.outputline("int " + varname + " = wi->word" + offset + ";");
+        return offset + 1;
     }
 
-    public int generate_workliststore(CodeWriter writer, int offset) {        
+    public int generate_workliststore(CodeWriter writer, int offset) {
         String varname = var.getSafeSymbol();
         writer.outputline("wi->word" + offset + " = " + varname + ";");
-        return offset + 1;       
+        return offset + 1;
     }