Update virtual pointers for C++ code...Various fixes to emit extern declarations.

[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 c9ef3dfb306d8492d08a00585c43008a3da4e4a1..379a5099a57adaa1daa7c057ea251ba3d1231662 100755 (executable)
--- a/Repair/RepairCompiler/MCC/IR/SetQuantifier.java
+++ b/Repair/RepairCompiler/MCC/IR/SetQuantifier.java
@@ -38,9 +38,30 @@ public class SetQuantifier extends Quantifier {
     }
 
     public void generate_open(CodeWriter writer) {
-        writer.outputline("for (SimpleIterator* " + var.getSafeSymbol() + "_iterator = " + set.getSafeSymbol() + "_hash->iterator(); " + var.getSafeSymbol() + "_iterator->hasNext(); )");
+       writer.outputline("SimpleIterator "+var.getSafeSymbol()+"_iterator;");
+        writer.outputline("for (" + set.getSafeSymbol() + "_hash->iterator("+var.getSafeSymbol()+"_iterator); " + var.getSafeSymbol() + "_iterator.hasNext(); )");
         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() + ") " + var.getSafeSymbol() + "_iterator.next();");
+    }
+  
+    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("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.startblock();
+        writer.outputline(var.getType().getGenerateType() + " " + var.getSafeSymbol() + ";");
+       writer.outputline("if ("+type+"=="+number+")");
+       writer.startblock();
+       writer.outputline(tmp.getSafeSymbol()+"=0;");
+        writer.outputline(var.getSafeSymbol() + " = (" + var.getType().getGenerateType() + ") " + left + ";");
+       writer.endblock();
+       writer.outputline("else");
+        writer.outputline(var.getSafeSymbol() + " = (" + var.getType().getGenerateType() + ") " + var.getSafeSymbol() + "_iterator.next();");
     }
   
     public int generate_worklistload(CodeWriter writer, int offset) {