fix changes checked in earlier

diff --git a/Robust/src/Benchmarks/Chat/ChatServer.java b/Robust/src/Benchmarks/Chat/ChatServer.java
index 4a0962938b0ef1a2014d92ab8c127362749d02a8..773a13406b40778546f7afa39f3b6e193acc927d 100644 (file)
--- a/Robust/src/Benchmarks/Chat/ChatServer.java
+++ b/Robust/src/Benchmarks/Chat/ChatServer.java
@@ -22,7 +22,7 @@ task ProcessRoom(ChatSocket cs{ProcessRoom}, RoomObject ro{Initialized}) {
     taskexit(cs{!ProcessRoom, InRoom});
 }
 
-task Messages(ChatSocket cs{InRoom && IOPending}) {
+task Message(ChatSocket cs{InRoom && IOPending}) {
     byte buffer[]=new byte[1024];
     int length=cs.read(buffer);
     Message m=new Message(buffer, length, cs){};

diff --git a/Robust/src/Main/Main.java b/Robust/src/Main/Main.java
index b0ff6efdd4dc2df6b57f753daac8950ffb3c85b3..8151d7d1d98ef3b50b507a2a14a8e2e462ccb708 100644 (file)
--- a/Robust/src/Main/Main.java
+++ b/Robust/src/Main/Main.java
@@ -76,8 +76,10 @@ public class Main {
       if (state.THREAD) {
          readSourceFile(state, ClassLibraryPrefix+"Thread.java");
          readSourceFile(state, ClassLibraryPrefix+"ObjectJava.java");
-      } else
+      } else {
          readSourceFile(state, ClassLibraryPrefix+"Object.java");
+         //      readSourceFile(state, ClassLibraryPrefix+"TagDescriptor.java");
+      }
 
       if (state.TASK) {
          readSourceFile(state, ClassLibraryPrefix+"StartupObject.java");
@@ -107,8 +109,8 @@ public class Main {
 //    PrintTree ptree1=new PrintTree(state);
 //  ptree1.buildtree();
 
-       TaskAnalysis ta=new TaskAnalysis(state,bf.getMap());
-       ta.taskAnalysis();
+//     TaskAnalysis ta=new TaskAnalysis(state,bf.getMap());
+//     ta.taskAnalysis();
 //     ta.printAdjList();
 
 

diff --git a/Robust/src/Tests/TaskExample.java b/Robust/src/Tests/TaskExample.java
index b0a53e99688c3e92fe4bdd141cb55e0897edee14..8ad37b3409587e5e16194f35283a7fcda99b40cc 100644 (file)
--- a/Robust/src/Tests/TaskExample.java
+++ b/Robust/src/Tests/TaskExample.java
@@ -42,7 +42,7 @@ task DoOperation(Example e{needoperation}) {
  * expressions.  For example, needprinting && ! needoperation would
  * also be a legal flag expression */
 
-task DoPrint(Example e{needprinting && ! needoperation}) {
+task DoPrint(Example e{needprinting}) {
     System.printInt(e.z);
     System.printString("\n");
     taskexit(e {!needprinting});

diff --git a/Robust/src/buildscript b/Robust/src/buildscript
index f052798d4992414a9e331818a0c469c84709f2d7..19d68dd115473f240019813bc5a0d0453bd62058 100755 (executable)
--- a/Robust/src/buildscript
+++ b/Robust/src/buildscript
@@ -191,3 +191,4 @@ gcc $INCLUDES $EXTRAOPTIONS -DPRECISE_GC \
 tmpbuilddirectory/methods.c $FILES -o $MAINFILE.bin
 
 exit
+

diff --git a/Robust/src/buildscripttask b/Robust/src/buildscripttask
index ddabf2a07ab785a4d5570bae4306d082ee16aa60..fb2b4065e3ac03061f81494b4134a9e13421b2e1 100755 (executable)
--- a/Robust/src/buildscripttask
+++ b/Robust/src/buildscripttask
@@ -1,14 +1,4 @@
 #!/bin/bash
-
-#ROBUSTROOT=~/research/Robust/src
-#MAINFILE=$1
-#shift
-#mkdir tmpbuilddirectory
-
-#java -cp $ROBUSTROOT/../cup/:$ROBUSTROOT Main.Main -classlibrary $ROBUSTROOT/ClassLibrary/ -dir tmpbuilddirectory -precise -struct $MAINFILE -task $@
-
-#gcc -DPRECISE_GC -I$ROBUSTROOT/Runtime -I. -IRuntime/include -Itmpbuilddirectory -O0 -LRuntime/lib/ -DTASK -DDEBUG -g tmpbuilddirectory/methods.c tmpbuilddirectory/taskdefs.c $ROBUSTROOT/Runtime/runtime.c $ROBUSTROOT/Runtime/file.c $ROBUSTROOT/Runtime/socket.c $ROBUSTROOT/Runtime/Queue.c $ROBUSTROOT/Runtime/SimpleHash.c $ROBUSTROOT/Runtime/checkpoint.c $ROBUSTROOT/Runtime/GenericHashtable.c $ROBUSTROOT/Runtime/option.c $ROBUSTROOT/Runtime/garbage.c -o $MAINFILE.bin
-#=======
-#echo THIS FILE IS DEPRECATED.  DO NOT USE IT.
+echo THIS FILE IS DEPRECATED.  DO NOT USE IT.
 ./buildscript -recover -o $@
-#>>>>>>> 1.15
+