From 7c42de6b0d416cceacf3a88500d6b20b75e64d2b Mon Sep 17 00:00:00 2001
From: bdemsky <bdemsky>
Date: Wed, 18 Jul 2007 23:21:06 +0000
Subject: [PATCH] changes

---
 Robust/src/Lex/Keyword.java | 1 -
 Robust/src/Lex/Lexer.java   | 2 +-
 Robust/src/Makefile         | 2 +-
 Robust/src/Parse/java14.cup | 4 ++--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Robust/src/Lex/Keyword.java b/Robust/src/Lex/Keyword.java
index 08fb391b..7d6ca909 100644
--- 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 9938d0b7..2cdd84e9 100644
--- 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 ee3dbb19..aa6ba471 100644
--- 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 f98ec7fb..4514bf9b 100644
--- 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);
-- 
2.34.1