Small changes

diff --git a/Robust/src/ClassLibrary/FileInputStream.java b/Robust/src/ClassLibrary/FileInputStream.java
index 2de45c83ef5bc1407d420f2fb3e171f50c8031cf..3a62d054d6583bddaa2f81e36f79cfe66ce5db30 100644 (file)
--- a/Robust/src/ClassLibrary/FileInputStream.java
+++ b/Robust/src/ClassLibrary/FileInputStream.java
@@ -8,6 +8,9 @@ public class FileInputStream {
     public FileInputStream(File path) {
        fd=nativeOpen(path.getPath().getBytes());
     }
+    public int getfd() {
+       return fd;
+    }
 
     private static native int nativeOpen(byte[] filename);
     private static native int nativeRead(int fd, byte[] array, int numBytes);

diff --git a/Robust/src/Makefile b/Robust/src/Makefile
index 75aa8ad0fffd8c8649e77016d38eb7e9547a49c2..ca2c2c580fb78257f99516b58be3daa1bb2814e0 100644 (file)
--- a/Robust/src/Makefile
+++ b/Robust/src/Makefile
@@ -1,22 +1,24 @@
-CLASSFILES= Main/Main.class IR/AssignOperation.class                   \
-IR/ClassDescriptor.class IR/Descriptor.class IR/FieldDescriptor.class  \
-IR/FlagDescriptor.class IR/Flat/BuildCode.class                                \
-IR/Flat/BuildFlat.class IR/Flat/FKind.class IR/Flat/FlatCall.class     \
-IR/Flat/FlatCastNode.class IR/Flat/FlatCondBranch.class                        \
-IR/Flat/FlatElementNode.class IR/Flat/FlatFieldNode.class              \
-IR/Flat/FlatLiteralNode.class IR/Flat/FlatMethod.class                 \
-IR/Flat/FlatNew.class IR/Flat/FlatNode.class IR/Flat/FlatNop.class     \
-IR/Flat/FlatOpNode.class IR/Flat/FlatReturnNode.class                  \
-IR/Flat/FlatFlagActionNode.class IR/Flat/FlatSetElementNode.class      \
-IR/Flat/FlatSetFieldNode.class IR/Flat/NodePair.class                  \
-IR/Flat/ParamsObject.class IR/Flat/TempDescriptor.class                        \
-IR/Flat/TempObject.class IR/MethodDescriptor.class                     \
-IR/NameDescriptor.class IR/Operation.class IR/State.class              \
-IR/SymbolTable.class IR/TaskDescriptor.class                           \
-IR/Tree/ArrayAccessNode.class IR/Tree/AssignmentNode.class             \
-IR/Tree/BlockExpressionNode.class IR/Tree/BlockNode.class              \
-IR/Tree/BlockStatementNode.class IR/Tree/BuildIR.class                 \
-IR/Tree/CastNode.class IR/Tree/CreateObjectNode.class                  \
+CLASSFILES= Main/Main.class Lex/BooleanLiteral.class                   \
+Lex/CharacterLiteral.class Lex/Comment.class                           \
+Lex/DocumentationComment.class Lex/DoubleLiteral.class Lex/EOF.class   \
+Lex/EndOfLineComment.class Lex/EscapedUnicodeReader.class              \
+Lex/FIFO.class Lex/FloatLiteral.class Lex/Identifier.class             \
+Lex/InputElement.class Lex/IntegerLiteral.class Lex/Keyword.class      \
+Lex/Lexer.class Lex/Literal.class Lex/LongLiteral.class                        \
+Lex/NullLiteral.class Lex/NumericLiteral.class Lex/Operator.class      \
+Lex/Separator.class Lex/StringLiteral.class Lex/Token.class            \
+Lex/TraditionalComment.class Lex/WhiteSpace.class                      \
+IR/AssignOperation.class IR/ClassDescriptor.class IR/Descriptor.class  \
+IR/FieldDescriptor.class IR/FlagDescriptor.class                       \
+IR/MethodDescriptor.class IR/NameDescriptor.class IR/Operation.class   \
+IR/State.class IR/SymbolTable.class IR/TaskDescriptor.class            \
+IR/TypeDescriptor.class IR/TypeUtil.class IR/VarDescriptor.class       \
+IR/Virtual.class IR/Tree/ArrayAccessNode.class                         \
+IR/Tree/AssignmentNode.class IR/Tree/BlockExpressionNode.class         \
+IR/Tree/BlockNode.class IR/Tree/BlockStatementNode.class               \
+IR/Tree/BuildIR.class IR/Tree/CastNode.class                           \
+IR/Tree/ConstraintCheck.class IR/Tree/CreateObjectNode.class           \
+IR/Tree/DNFFlag.class IR/Tree/DNFFlagAtom.class                                \
 IR/Tree/DeclarationNode.class IR/Tree/ExpressionNode.class             \
 IR/Tree/FieldAccessNode.class IR/Tree/FlagEffect.class                 \
 IR/Tree/FlagEffects.class IR/Tree/FlagExpressionNode.class             \
@@ -28,20 +30,18 @@ IR/Tree/NameNode.class IR/Tree/OpNode.class IR/Tree/ParseNode.class \
 IR/Tree/ParseNodeDOTVisitor.class IR/Tree/ParseNodeVector.class                \
 IR/Tree/ReturnNode.class IR/Tree/SemanticCheck.class                   \
 IR/Tree/SubBlockNode.class IR/Tree/TaskExitNode.class                  \
-IR/Tree/TreeNode.class IR/Tree/Walkable.class IR/TypeDescriptor.class  \
-IR/TypeUtil.class IR/VarDescriptor.class IR/Virtual.class              \
-Lex/BooleanLiteral.class Lex/CharacterLiteral.class Lex/Comment.class  \
-Lex/DocumentationComment.class Lex/DoubleLiteral.class                 \
-Lex/EndOfLineComment.class Lex/EOF.class                               \
-Lex/EscapedUnicodeReader.class Lex/FIFO.class Lex/FloatLiteral.class   \
-Lex/Identifier.class Lex/InputElement.class Lex/IntegerLiteral.class   \
-Lex/Keyword.class Lex/Lexer.class Lex/Literal.class                    \
-Lex/LongLiteral.class Lex/NullLiteral.class Lex/NumericLiteral.class   \
-Lex/Operator.class Lex/Separator.class Lex/StringLiteral.class         \
-Lex/Token.class Lex/TraditionalComment.class Lex/WhiteSpace.class      \
-Analysis/Flag/FlagState.class Analysis/Flag/FlagAnalysis.class         \
-Analysis/CallGraph/CallGraph.class
-
+IR/Tree/TreeNode.class IR/Tree/Walkable.class IR/Flat/BuildCode.class  \
+IR/Flat/BuildFlat.class IR/Flat/FKind.class IR/Flat/FlatCall.class     \
+IR/Flat/FlatCastNode.class IR/Flat/FlatCheckNode.class                 \
+IR/Flat/FlatCondBranch.class IR/Flat/FlatElementNode.class             \
+IR/Flat/FlatFieldNode.class IR/Flat/FlatFlagActionNode.class           \
+IR/Flat/FlatLiteralNode.class IR/Flat/FlatMethod.class                 \
+IR/Flat/FlatNew.class IR/Flat/FlatNode.class IR/Flat/FlatNop.class     \
+IR/Flat/FlatOpNode.class IR/Flat/FlatReturnNode.class                  \
+IR/Flat/FlatSetElementNode.class IR/Flat/FlatSetFieldNode.class                \
+IR/Flat/NodePair.class IR/Flat/ParamsObject.class                      \
+IR/Flat/TempDescriptor.class IR/Flat/TempFlagPair.class                        \
+IR/Flat/TempObject.class
 
 all: Parse/Sym.class Parse/Parser.class $(CLASSFILES) javadoc
 

diff --git a/Robust/src/Runtime/runtime.c b/Robust/src/Runtime/runtime.c
index b1972f97608c3249ca24634110276a1e1a5c5ddb..05e014c487ff1ce6126f8a5cffc6f885c546e579 100644 (file)
--- a/Robust/src/Runtime/runtime.c
+++ b/Robust/src/Runtime/runtime.c
@@ -272,7 +272,7 @@ void executetasks() {
          /* Recover */
          int h;
 #ifdef DEBUG
-         printf("Recovering\n");
+         printf("Fatal Error! Recovering!\n");
 #endif
          genputtable(failedtasks,tpd,tpd);
          restorecheckpoint(tpd->task->numParameters, taskpointerarray, checkpoint, forward, reverse);

diff --git a/Robust/src/Tests/Logger.java b/Robust/src/Tests/Logger.java
index 25eda4ada8ff86d9e87291c1e7b177d344bf5e08..88f97142c95cafc855b657f935515045df00985e 100644 (file)
--- a/Robust/src/Tests/Logger.java
+++ b/Robust/src/Tests/Logger.java
@@ -5,7 +5,7 @@ public class Logger extends FileOutputStream {
        //Constructor
        public Logger(){
                System.printString(" Log Object Created\n");
-               FileOutputStreamOpen("./Tests/htmlfiles/request.log");
+               //FileOutputStreamOpen("./Tests/htmlfiles/request.log");
        }
 /*
        public void logrequest(String filename){