misc parser changes

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / core / compiler / ITerminalSymbols.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/compiler/ITerminalSymbols.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/compiler/ITerminalSymbols.java
index cc27c47..4a841f4 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/compiler/ITerminalSymbols.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/compiler/ITerminalSymbols.java
@@ -38,12 +38,12 @@ public interface ITerminalSymbols {
   public final static int TokenNameWHITESPACE = 900,
     TokenNameCOMMENT_LINE = 901,
     TokenNameCOMMENT_BLOCK = 902,
-    TokenNameCOMMENT_PHPDOC = 903,
-    TokenNameHTML = 904;
+    TokenNameCOMMENT_PHPDOC = 903;
+//    TokenNameHTML = 904;
 
   final static int TokenNameEOF = 0;
   final static int TokenNameERROR = 1;
-  final static int TokenNameStopPHP = 2;
+  final static int TokenNameINLINE_HTML = 2;
 
   final static int TokenNameREMAINDER = 30;
   final static int TokenNameNOT = 31;
@@ -79,8 +79,13 @@ public interface ITerminalSymbols {
   final static int TokenNameQUESTION = 62;
   final static int TokenNamePAAMAYIM_NEKUDOTAYIM = 63;
   final static int TokenNameAT = 64;
+  
+  final static int TokenNameand = 65;
+  final static int TokenNameor = 66;
+  final static int TokenNamexor = 67;
 
-  final static int TokenNameDOLLAR_LBRACE = 127;
+  final static int TokenNameDOLLAR = 126;
+//  final static int TokenNameDOLLAR_LBRACE = 127;
   final static int TokenNameLPAREN = 128;
   final static int TokenNameRPAREN = 129;
   final static int TokenNameLBRACE = 130;
@@ -108,9 +113,19 @@ public interface ITerminalSymbols {
   final static int TokenNameRIGHT_SHIFT = 156;
   final static int TokenNameEQUAL_EQUAL_EQUAL = 157;
   final static int TokenNameNOT_EQUAL_EQUAL = 158;
-  final static int TokenNameOR = 159;
-  final static int TokenNameHEREDOC = 160;
+  
+  final static int TokenNameOR = 160;
+  final static int TokenNameHEREDOC = 161;
 
+  final static int TokenNameintCAST = 174;
+  final static int TokenNameboolCAST = 175;
+  final static int TokenNamedoubleCAST = 176;
+  final static int TokenNamestringCAST = 177;
+  final static int TokenNamearrayCAST = 178;
+  final static int TokenNameobjectCAST = 179;
+  final static int TokenNameunsetCAST = 180;
+  
+  
   public final static int TokenNameKEYWORD = 1000;
   public final static int TokenNameif = 1001;
   public final static int TokenNameelseif = 1002;
@@ -158,7 +173,7 @@ public interface ITerminalSymbols {
 //  public final static int TokenNamenull = 1044;
 //  public final static int TokenNamefalse = 1045;
 //  public final static int TokenNametrue = 1046;
-       public final static int TokenNamethis = 1047;
+//     public final static int TokenNamethis = 1047;
        //
        public final static int TokenNameabstract = 1050;
        public final static int TokenNamecatch = 1051;
@@ -173,7 +188,8 @@ public interface ITerminalSymbols {
        public final static int TokenNamesuper = 1060;
        public final static int TokenNamethrow = 1061;
 
-       public final static int TokenNameconst = 1063;
+       public final static int TokenNameconst = 1062;
+       public final static int TokenNameclone = 1063;
        public final static int TokenNamedeclare = 1064;
        public final static int TokenNameenddeclare = 1065;
        public final static int TokenNameeval = 1065;