Fixed small conflicts in Translator.
[charm.git] / src / langs / charj / src / charj / translator / Charj.g
index 94e671962dcc279bec1f9f866ce21ac51745ff53..3079760bdf46375330dc64f25614c5e2c49e20fa 100644 (file)
@@ -117,6 +117,7 @@ tokens {
 
     PUP                     = 'pup'             ;
     INITMETHOD              = 'initMethod'      ;
+    CTORHELPER              = 'ctorHelper'      ;
 
 
     // C++ keywords that aren't used in charj. 
@@ -213,6 +214,9 @@ tokens {
     ACCESS_MODIFIER_LIST;
     CHARJ_MODIFIER_LIST;
     OTHER_MODIFIER_LIST;
+    POINTER_DEREFERENCE;
+    ENTRY_FUNCTION_DECL;
+    ENTRY_CONSTRUCTOR_DECL;
 }
 
 @header {