adding thread support w/ locks

[IRC.git] / Robust / src / Main / Main.java

diff --git a/Robust/src/Main/Main.java b/Robust/src/Main/Main.java
index 8fd212ebeb492d1c17e7e1fe6f910b7d387d3da4..4f391128fd5134aa1238a6bc744b9cb06e88dd2e 100644 (file)
--- a/Robust/src/Main/Main.java
+++ b/Robust/src/Main/Main.java
@@ -57,7 +57,7 @@ public class Main {
          }
       }
       
-      readSourceFile(state, ClassLibraryPrefix+"Object.java");
+
       readSourceFile(state, ClassLibraryPrefix+"System.java");
       readSourceFile(state, ClassLibraryPrefix+"String.java");
       readSourceFile(state, ClassLibraryPrefix+"HashSet.java");
@@ -70,10 +70,12 @@ public class Main {
       readSourceFile(state, ClassLibraryPrefix+"FileOutputStream.java");
       readSourceFile(state, ClassLibraryPrefix+"File.java");
       if (state.TASK) {
+         readSourceFile(state, ClassLibraryPrefix+"Object.java");
          readSourceFile(state, ClassLibraryPrefix+"StartupObject.java");
          readSourceFile(state, ClassLibraryPrefix+"Socket.java");
          readSourceFile(state, ClassLibraryPrefix+"ServerSocket.java");
       } else {
+         readSourceFile(state, ClassLibraryPrefix+"ObjectJava.java");
          readSourceFile(state, ClassLibraryPrefix+"SocketJava.java");
          readSourceFile(state, ClassLibraryPrefix+"ServerSocketJava.java");
       }
@@ -91,7 +93,7 @@ public class Main {
       sc.semanticCheck();
       tu.createFullTable();
 
-      BuildFlat bf=new BuildFlat(state);
+      BuildFlat bf=new BuildFlat(state,tu);
       bf.buildFlat();
       
       BuildCode bc=new BuildCode(state, bf.getMap(), tu);