From: bdemsky <bdemsky>
Date: Fri, 8 Sep 2006 01:05:11 +0000 (+0000)
Subject: integration with checking code
X-Git-Tag: preEdgeChange~831
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e562dbcf174dad55ba6899228b5049a13ae8800b;p=IRC.git

integration with checking code
---

diff --git a/Robust/src/IR/Flat/BuildCode.java b/Robust/src/IR/Flat/BuildCode.java
index 6f906751..8fe28732 100644
--- a/Robust/src/IR/Flat/BuildCode.java
+++ b/Robust/src/IR/Flat/BuildCode.java
@@ -941,7 +941,9 @@ public class BuildCode {
 	    output.println("if (doanalysis"+specname+"("+varname+")) {");
 	    output.println("free"+specname+"_state("+varname+");");
 	    output.println("} else {");
+	    output.println("/* Bad invariant */");
 	    output.println("free"+specname+"_state("+varname+");");
+	    output.println("abort_task();");
 	    output.println("}");
 
 	    output.println("}");
diff --git a/Robust/src/IR/Tree/BuildIR.java b/Robust/src/IR/Tree/BuildIR.java
index e3f5a4e5..52becbd0 100644
--- a/Robust/src/IR/Tree/BuildIR.java
+++ b/Robust/src/IR/Tree/BuildIR.java
@@ -423,7 +423,7 @@ public class BuildIR {
 	for(int i=0;i<anv.size();i++) {
 	    ParseNode cpn=anv.elementAt(i);
 	    ParseNode var=cpn.getChild("var");
-	    ParseNode exp=cpn.getChild("exp");
+	    ParseNode exp=cpn.getChild("exp").getFirstChild();
 	    varlist.add(var.getTerminal());
 	    arglist.add(parseExpression(exp));
 	}
diff --git a/Robust/src/IR/Tree/ConstraintCheck.java b/Robust/src/IR/Tree/ConstraintCheck.java
index 983c225c..2af99398 100644
--- a/Robust/src/IR/Tree/ConstraintCheck.java
+++ b/Robust/src/IR/Tree/ConstraintCheck.java
@@ -35,7 +35,7 @@ public class ConstraintCheck {
     }
 
     public String getVar(int i) {
-	return (String) args.get(i);
+	return (String) vars.get(i);
     }
 
     public String printNode(int indent) {
diff --git a/Robust/src/Parse/java14.cup b/Robust/src/Parse/java14.cup
index ad2e6a92..4a6877a4 100644
--- a/Robust/src/Parse/java14.cup
+++ b/Robust/src/Parse/java14.cup
@@ -1220,7 +1220,7 @@ class_instance_creation_expression ::=
 	;
 cons_argument_list_opt ::=
 	{: RESULT=new ParseNode("empty"); :}
-	|	argument_list:args {: RESULT=args; :}
+	|	cons_argument_list:args {: RESULT=args; :}
 	;
 
 cons_argument_list ::=
diff --git a/Robust/src/Runtime/runtime.c b/Robust/src/Runtime/runtime.c
index 818138de..8126ca13 100644
--- a/Robust/src/Runtime/runtime.c
+++ b/Robust/src/Runtime/runtime.c
@@ -19,7 +19,7 @@ jmp_buf error_handler;
 #include "SimpleHash.h"
 #include "GenericHashtable.h"
 #ifdef CONSCHECK
-#include "initialize.h"
+#include "instrument.h"
 #endif
 
 struct Queue * activetasks;
@@ -304,3 +304,12 @@ void failednullptr() {
   longjmp(error_handler,3);
 #endif
 }
+
+void abort_task() {
+#ifndef TASK
+  printf("Aborting\n");
+  exit(-1);
+#else
+  longjmp(error_handler,4);
+#endif
+}
diff --git a/Robust/src/Runtime/runtime.h b/Robust/src/Runtime/runtime.h
index 307679cb..d02c7286 100644
--- a/Robust/src/Runtime/runtime.h
+++ b/Robust/src/Runtime/runtime.h
@@ -9,6 +9,7 @@ struct ___String___ * NewString(char *str,int length);
 
 void failedboundschk();
 void failednullptr();
+void abort_task();
 
 #ifdef TASK
 #include "SimpleHash.h"
diff --git a/Robust/src/buildscriptrepair b/Robust/src/buildscriptrepair
index 1caf13f2..69dd5dd9 100755
--- a/Robust/src/buildscriptrepair
+++ b/Robust/src/buildscriptrepair
@@ -53,7 +53,8 @@ done
 
 #build and link everything
 
-cd $CURDIR gcc -I$ROBUSTROOT/Runtime -I. -I$BUILDDIR/specdir \
+cd $CURDIR 
+gcc -I$ROBUSTROOT/Runtime -I. -I$BUILDDIR/specdir \
 -IRuntime/include -I$BUILDDIR -O0 -DBOEHM_GC -DCONSCHECK \
 -LRuntime/lib/ -lgc -DTASK -g tmpbuilddirectory/methods.c \
 tmpbuilddirectory/taskdefs.c $ROBUSTROOT/Runtime/runtime.c \