Generalize definition of SumExpr a little...Lets sum all elements of

the set S.R...

		Brian

diff --git a/Repair/RepairCompiler/MCC/IR/DotExpr.java b/Repair/RepairCompiler/MCC/IR/DotExpr.java
index 4f550a4cce8231f1c18b72f3229785be1f6ed6f9..be8d32489fbae24cd327c32c5192b6f99005c2fa 100755 (executable)
--- a/Repair/RepairCompiler/MCC/IR/DotExpr.java
+++ b/Repair/RepairCompiler/MCC/IR/DotExpr.java
@@ -380,6 +380,9 @@ public class DotExpr extends Expr {
                assert intindex == null;
                intindex = ld.getIndex();
            } else {
+                if (fd==null) {
+                    throw new Error("Null fd for: "+field);
+                }
                fieldtype = fd.getType();
                intindex=index;
            }

diff --git a/Repair/RepairCompiler/MCC/IR/SumExpr.java b/Repair/RepairCompiler/MCC/IR/SumExpr.java
index 4c22d37890439cda08718785fcab64334de19cf0..c2b30ff3ff42a0fe06fd5c194ae1fed4b05dfe06 100755 (executable)
--- a/Repair/RepairCompiler/MCC/IR/SumExpr.java
+++ b/Repair/RepairCompiler/MCC/IR/SumExpr.java
@@ -61,15 +61,33 @@ public class SumExpr extends Expr {
         VarDescriptor itvd=VarDescriptor.makeNew("iterator");
         writer.addDeclaration("struct SimpleIterator",itvd.getSafeSymbol());
         writer.outputline("SimpleHashiterator("+sd.getSafeSymbol()+"_hash , &"+itvd.getSafeSymbol()+");");
-        writer.outputline("while (hasNext(&"+itvd.getSafeSymbol()+")) {");
-        VarDescriptor keyvd=VarDescriptor.makeNew("key");
-        writer.addDeclaration("int",keyvd.getSafeSymbol());
-        writer.outputline(keyvd.getSafeSymbol()+"=next(&"+itvd.getSafeSymbol()+");");
-        VarDescriptor tmpvar=VarDescriptor.makeNew("tmp");
-        writer.addDeclaration("int",tmpvar.getSafeSymbol());
-        writer.outputline("SimpleHashget("+rd.getSafeSymbol()+"_hash, "+keyvd.getSafeSymbol()+", &"+tmpvar.getSafeSymbol()+");");
-        writer.outputline(dest.getSafeSymbol()+"+="+tmpvar.getSafeSymbol()+";");
-        writer.outputline("}");
+        writer.outputline("while (hasNext(&"+itvd.getSafeSymbol()+"))");
+        writer.startblock();
+        {
+            VarDescriptor keyvd=VarDescriptor.makeNew("key");
+            writer.addDeclaration("int",keyvd.getSafeSymbol());
+            writer.outputline(keyvd.getSafeSymbol()+"=next(&"+itvd.getSafeSymbol()+");");
+            VarDescriptor tmpvar=VarDescriptor.makeNew("tmp");
+            writer.addDeclaration("int",tmpvar.getSafeSymbol());
+
+            VarDescriptor newset=VarDescriptor.makeNew("newset");
+            writer.addDeclaration("struct SimpleHash *",newset.getSafeSymbol());
+            writer.outputline(newset.getSafeSymbol()+"=SimpleHashimageSet("+rd.getSafeSymbol()+"_hash, "+keyvd.getSafeSymbol()+", &"+tmpvar.getSafeSymbol()+");");
+
+            VarDescriptor itvd2=VarDescriptor.makeNew("iterator");
+            writer.addDeclaration("struct SimpleIterator",itvd2.getSafeSymbol());
+            writer.outputline("SimpleHashiterator("+newset.getSafeSymbol()+", &"+itvd2.getSafeSymbol()+");");
+
+            writer.outputline("while (hasNext(&"+itvd2.getSafeSymbol()+"))");
+            writer.startblock();
+            {
+                VarDescriptor keyvd2=VarDescriptor.makeNew("keyinner");
+                writer.outputline(dest.getSafeSymbol()+"+=next(&"+itvd2.getSafeSymbol()+");");
+                writer.endblock();
+            }
+            writer.outputline("freeSimpleHash("+newset.getSafeSymbol()+");");
+            writer.endblock();
+        }
     }
 
     public void prettyPrint(PrettyPrinter pp) {