changes

diff --git a/Robust/src/Lex/Keyword.java b/Robust/src/Lex/Keyword.java
index 08fb391b31b94bd2df570a694f120c2bf2e82bbf..7d6ca9094eb02703213c85a655551c797c31f4be 100644 (file)
--- a/Robust/src/Lex/Keyword.java
+++ b/Robust/src/Lex/Keyword.java
@@ -73,7 +73,6 @@ class Keyword extends Token {
     key_table.put("taskexit", new Integer(Sym.TASKEXIT));
     //Keywords for transactions
     key_table.put("atomic", new Integer(Sym.ATOMIC));
-    key_table.put("local", new Integer(Sym.LOCAL));
     key_table.put("global", new Integer(Sym.GLOBAL));
   }
 }

diff --git a/Robust/src/Lex/Lexer.java b/Robust/src/Lex/Lexer.java
index 9938d0b7753b315a70b4e1332a1523dc4794ab07..2cdd84e9da8f3d27a26ce86d041ebf868f13f403 100644 (file)
--- a/Robust/src/Lex/Lexer.java
+++ b/Robust/src/Lex/Lexer.java
@@ -249,7 +249,7 @@ public class Lexer {
     "extends", "external", "final", "finally", 
     "flag", //keyword for failure aware computation
     "float", "for", "global", "goto", "if", 
-    "implements", "import", "instanceof", "int", "interface", "local", "long",  
+    "implements", "import", "instanceof", "int", "interface", "long",  
     "native", "new", "optional", "package", "private", "protected", "public", 
     "return", "short", "static", "strictfp", "super", "switch", "synchronized",
     "tag", "task", "taskexit", //keywords for failure aware computation

diff --git a/Robust/src/Makefile b/Robust/src/Makefile
index ee3dbb193b73f856e98de7248591c30541ff6c69..aa6ba471ae69beda5b0c9312d13bd7b51d397a15 100644 (file)
--- a/Robust/src/Makefile
+++ b/Robust/src/Makefile
@@ -79,7 +79,7 @@ javadoc:
        javadoc -classpath ../cup:.:$(CLASSPATH) -sourcepath . -private -d javadoc Lex Util IR IR.Tree IR.Flat Analysis Analysis.CallGraph Analysis.Flag Analysis.TaskStateAnalysis Main 
 
 clean:
-       rm IR/*.class IR/Tree/*.class Main/*.class Lex/*.class Parse/*.class Parse/Sym.java Parse/Parser.java IR/Flat/*.class classdefs.h methodheaders.h methods.c structdefs.h virtualtable.h task.h taskdefs.c taskdefs.h Analysis/*.class Analysis/Flag/*.class Analysis/CallGraph/*.class  Analysis/TaskStateAnalysis/*.class Util/Relation/*.class Interface/*.class
+       rm IR/*.class IR/Tree/*.class Main/*.class Lex/*.class Parse/*.class Parse/Sym.java Parse/Parser.java IR/Flat/*.class classdefs.h methodheaders.h methods.c structdefs.h virtualtable.h task.h taskdefs.c taskdefs.h Analysis/*.class Analysis/Flag/*.class Analysis/CallGraph/*.class  Analysis/TaskStateAnalysis/*.class Interface/*.class Util/*.class
 
 cleandoc:
        rm -rf javadoc
\ No newline at end of file

diff --git a/Robust/src/Parse/java14.cup b/Robust/src/Parse/java14.cup
index f98ec7fb96bd35053323283d0889697c73262eb3..4514bf9bfb7fc0317067f543e116f288dea737af 100644 (file)
--- a/Robust/src/Parse/java14.cup
+++ b/Robust/src/Parse/java14.cup
@@ -254,7 +254,6 @@ non terminal ParseNode tag_change;
 
 //distributed transaction keywords
 terminal ATOMIC;
-terminal LOCAL;
 terminal GLOBAL;
 non terminal ParseNode atomic_statement;
 
@@ -1362,8 +1361,9 @@ class_instance_creation_expression ::=
                RESULT=pn;
        :} 
        //Global object
-       | LOCAL NEW class_or_interface_type:type LPAREN argument_list_opt:args RPAREN flag_list_opt:feo {: 
+       | GLOBAL NEW class_or_interface_type:type LPAREN argument_list_opt:args RPAREN flag_list_opt:feo {: 
                ParseNode pn=new ParseNode("createobject");
+               pn.addChild("global");
                pn.addChild(type);
                pn.addChild(args);
                pn.addChild(feo);