From 4503a799c894a902c850f007e15702dd5d223399 Mon Sep 17 00:00:00 2001
From: bdemsky <bdemsky>
Date: Wed, 2 May 2007 04:36:34 +0000
Subject: [PATCH] fix changes checked in earlier

---
 Robust/src/Benchmarks/Chat/ChatServer.java |  2 +-
 Robust/src/Main/Main.java                  |  8 +++++---
 Robust/src/Tests/TaskExample.java          |  2 +-
 Robust/src/buildscript                     |  1 +
 Robust/src/buildscripttask                 | 14 ++------------
 5 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/Robust/src/Benchmarks/Chat/ChatServer.java b/Robust/src/Benchmarks/Chat/ChatServer.java
index 4a096293..773a1340 100644
--- 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 b0ff6efd..8151d7d1 100644
--- 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 b0a53e99..8ad37b34 100644
--- 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 f052798d..19d68dd1 100755
--- 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 ddabf2a0..fb2b4065 100755
--- 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
+
-- 
2.34.1