problems getting william's code to compile

diff --git a/Robust/src/IR/Flat/BuildCode.java b/Robust/src/IR/Flat/BuildCode.java
index f253e6da5bd1635912c2709dbadcd6311ca8d9ef..4a8d628bf1ea170a902b4aeb39a58c026081ff95 100644 (file)
--- a/Robust/src/IR/Flat/BuildCode.java
+++ b/Robust/src/IR/Flat/BuildCode.java
@@ -2113,9 +2113,9 @@ public class BuildCode {
         headers.println("int numotd;");
         headers.println("struct optionaltaskdescriptor ** otdarray;");
         headers.println("int numfsanalysiswrappers;");
-        headers.println("struct fsanalysiswrapper ** fsanalysiswrapperarray;\n};\n\n");
+        headers.println("struct fsanalysiswrapper ** fsanalysiswrapperarray;\n};");
         
-        headers.println("struct classanalysiswrapper * classanalysiswrapperarray[];\n");
+        headers.println("extern struct classanalysiswrapper * classanalysiswrapperarray[];");
 
        
 
@@ -2418,11 +2418,15 @@ public class BuildCode {
         
         //build an array containing every classes for which code has been build
         output.println("struct classanalysiswrapper * classanalysiswrapperarray[]={");
+        boolean needcomma=false;
         for(Iterator classit = processedcd.iterator(); classit.hasNext();){
             ClassDescriptor cdtemp=(ClassDescriptor)classit.next();
-            if(!classit.hasNext()) output.println("&classanalysiswrapper_"+cdtemp.getSafeSymbol()+"};\n");
-            else output.println("&classanalysiswrapper_"+cdtemp.getSafeSymbol()+",");
+            if (needcomma)
+                output.println(", ");
+            needcomma=true;
+            output.println("&classanalysiswrapper_"+cdtemp.getSafeSymbol());
         }
+        output.println("};");
         
         output.println("int numclasses="+processedcd.size()+";");
         headers.println("extern numclasses;");

diff --git a/Robust/src/Runtime/task.c b/Robust/src/Runtime/task.c
index bdde536adf54591dd576a05e40be6f28027b71bd..5986ae9edff00b84e6f421bc59e8f65d7a419fb2 100644 (file)
--- a/Robust/src/Runtime/task.c
+++ b/Robust/src/Runtime/task.c
@@ -359,10 +359,6 @@ void flagorand(void * ptr, int ormask, int andmask) {
 #endif
     {
     flag&=andmask;
-    // Not sure why this was necessary
-    //  if (flag==oldflag) /* Don't do anything */
-    //  return;
-    //else 
     flagbody(ptr, flag);
     }
 }
@@ -372,15 +368,16 @@ void intflagorand(void * ptr, int ormask, int andmask) {
   int flag=ormask|oldflag;
 #ifdef OPTIONAL
   struct ___Object___ * obj = (struct ___Object___ *)ptr;
-  if(obj->failedstatus==1){/*store the information about exitfses*/
+  if(obj->failedstatus==1) {/*store the information about exitfses*/
     int i,j,counter=0, offset=0;
-    for(i=0; i<obj->numotds; i++){
+    for(i=0; i<obj->numotds; i++) {
       counter+=obj->otds[i]->numenterflags;
     }
     obj->numexitfses=counter;
-    if(obj->exitfses!=NULL) RUNFREE(obj->exitfses);
+    if(obj->exitfses!=NULL) 
+      RUNFREE(obj->exitfses);
     obj->exitfses= RUNMALLOC(sizeof(int) * counter);
-    for(i=0; i<obj->numotds; i++){
+    for(i=0; i<obj->numotds; i++) {
       for(j=0; j<obj->otds[i]->numenterflags; j++){
        oldflag=obj->otds[i]->enterflags[j];
        flag=ormask|oldflag;
@@ -438,7 +435,7 @@ void flagorandinit(void * ptr, int ormask, int andmask) {
    while(flagptr!=NULL) {
      struct ___Object___ *temp=NULL;
      struct parameterwrapper *ptr;
-     struct RuntimeNode * node = flagptr->objectset->listhead;
+     struct ObjectNode * node = flagptr->objectset->listhead;
      while(node!=NULL){
        temp=(struct ___Object___ *)node->key;
        if(temp->failedstatus==1 && temp->hashcode==currobj->hashcode){