X-Git-Url: http://secure.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java b/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java
index d427051..6fc6c54 100644
--- a/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java
+++ b/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java
@@ -4,146 +4,178 @@ package test;
 public interface PHPParserConstants {
 
   int EOF = 0;
-  int PHPSTART = 1;
-  int PHPEND = 2;
-  int SINGLE_LINE_COMMENT = 12;
-  int FORMAL_COMMENT = 13;
-  int MULTI_LINE_COMMENT = 14;
-  int CLASS = 16;
-  int FUNCTION = 17;
-  int VAR = 18;
-  int IF = 19;
-  int ELSEIF = 20;
-  int ELSE = 21;
-  int ARRAY = 22;
-  int PRINT = 23;
-  int ECHO = 24;
-  int INCLUDE = 25;
-  int REQUIRE = 26;
-  int INCLUDE_ONCE = 27;
-  int REQUIRE_ONCE = 28;
-  int GLOBAL = 29;
-  int STATIC = 30;
-  int CLASSACCESS = 31;
-  int STATICCLASSACCESS = 32;
-  int ARRAYASSIGN = 33;
+  int PHPSTARTSHORT = 1;
+  int PHPSTARTLONG = 2;
+  int PHPECHOSTART = 3;
+  int PHPEND = 4;
+  int SINGLE_LINE_COMMENT = 20;
+  int CLASS = 27;
+  int FUNCTION = 28;
+  int VAR = 29;
+  int IF = 30;
+  int ELSEIF = 31;
+  int ELSE = 32;
+  int ARRAY = 33;
   int BREAK = 34;
-  int CASE = 35;
-  int CONST = 36;
-  int CONTINUE = 37;
-  int _DEFAULT = 38;
-  int DO = 39;
-  int EXTENDS = 40;
-  int FALSE = 41;
-  int FOR = 42;
-  int GOTO = 43;
-  int NEW = 44;
-  int NULL = 45;
-  int RETURN = 46;
-  int SUPER = 47;
-  int SWITCH = 48;
-  int THIS = 49;
-  int TRUE = 50;
-  int WHILE = 51;
-  int ENDWHILE = 52;
-  int STRING = 53;
-  int OBJECT = 54;
-  int BOOL = 55;
-  int BOOLEAN = 56;
-  int REAL = 57;
-  int DOUBLE = 58;
-  int FLOAT = 59;
-  int INT = 60;
-  int INTEGER = 61;
-  int _ORL = 62;
-  int _ANDL = 63;
-  int INTEGER_LITERAL = 64;
-  int DECIMAL_LITERAL = 65;
-  int HEX_LITERAL = 66;
-  int OCTAL_LITERAL = 67;
-  int FLOATING_POINT_LITERAL = 68;
-  int EXPONENT = 69;
-  int STRING_LITERAL = 70;
-  int STRING_1 = 71;
-  int STRING_2 = 72;
-  int STRING_3 = 73;
-  int IDENTIFIER = 74;
-  int LETTER = 75;
-  int DIGIT = 76;
-  int SPECIAL = 77;
-  int LPAREN = 78;
-  int RPAREN = 79;
-  int LBRACE = 80;
-  int RBRACE = 81;
-  int LBRACKET = 82;
-  int RBRACKET = 83;
-  int SEMICOLON = 84;
-  int COMMA = 85;
-  int DOT = 86;
-  int AT = 87;
-  int DOLLAR = 88;
-  int ASSIGN = 89;
-  int GT = 90;
-  int LT = 91;
-  int BANG = 92;
-  int HOOK = 93;
-  int COLON = 94;
-  int EQ = 95;
-  int LE = 96;
-  int GE = 97;
-  int NE = 98;
-  int SC_OR = 99;
-  int SC_AND = 100;
-  int INCR = 101;
-  int DECR = 102;
-  int PLUS = 103;
-  int MINUS = 104;
-  int STAR = 105;
-  int SLASH = 106;
-  int BIT_AND = 107;
-  int BIT_OR = 108;
-  int XOR = 109;
-  int REM = 110;
-  int LSHIFT = 111;
-  int RSIGNEDSHIFT = 112;
-  int RUNSIGNEDSHIFT = 113;
-  int PLUSASSIGN = 114;
-  int MINUSASSIGN = 115;
-  int STARASSIGN = 116;
-  int SLASHASSIGN = 117;
-  int ANDASSIGN = 118;
-  int ORASSIGN = 119;
-  int XORASSIGN = 120;
-  int DOTASSIGN = 121;
-  int REMASSIGN = 122;
-  int LSHIFTASSIGN = 123;
-  int RSIGNEDSHIFTASSIGN = 124;
-  int RUNSIGNEDSHIFTASSIGN = 125;
-  int DOLLAR_ID = 126;
+  int LIST = 35;
+  int PRINT = 36;
+  int ECHO = 37;
+  int INCLUDE = 38;
+  int REQUIRE = 39;
+  int INCLUDE_ONCE = 40;
+  int REQUIRE_ONCE = 41;
+  int GLOBAL = 42;
+  int DEFINE = 43;
+  int STATIC = 44;
+  int CLASSACCESS = 45;
+  int STATICCLASSACCESS = 46;
+  int ARRAYASSIGN = 47;
+  int CASE = 48;
+  int CONST = 49;
+  int CONTINUE = 50;
+  int _DEFAULT = 51;
+  int DO = 52;
+  int EXTENDS = 53;
+  int FOR = 54;
+  int GOTO = 55;
+  int NEW = 56;
+  int NULL = 57;
+  int RETURN = 58;
+  int SUPER = 59;
+  int SWITCH = 60;
+  int THIS = 61;
+  int TRUE = 62;
+  int FALSE = 63;
+  int WHILE = 64;
+  int ENDWHILE = 65;
+  int ENDSWITCH = 66;
+  int ENDIF = 67;
+  int ENDFOR = 68;
+  int FOREACH = 69;
+  int AS = 70;
+  int STRING = 71;
+  int OBJECT = 72;
+  int BOOL = 73;
+  int BOOLEAN = 74;
+  int REAL = 75;
+  int DOUBLE = 76;
+  int FLOAT = 77;
+  int INT = 78;
+  int INTEGER = 79;
+  int AT = 80;
+  int BANG = 81;
+  int TILDE = 82;
+  int HOOK = 83;
+  int COLON = 84;
+  int OR_OR = 85;
+  int AND_AND = 86;
+  int PLUS_PLUS = 87;
+  int MINUS_MINUS = 88;
+  int PLUS = 89;
+  int MINUS = 90;
+  int STAR = 91;
+  int SLASH = 92;
+  int BIT_AND = 93;
+  int BIT_OR = 94;
+  int XOR = 95;
+  int REMAINDER = 96;
+  int LSHIFT = 97;
+  int RSIGNEDSHIFT = 98;
+  int RUNSIGNEDSHIFT = 99;
+  int _ORL = 100;
+  int _ANDL = 101;
+  int INTEGER_LITERAL = 102;
+  int DECIMAL_LITERAL = 103;
+  int HEX_LITERAL = 104;
+  int OCTAL_LITERAL = 105;
+  int FLOATING_POINT_LITERAL = 106;
+  int EXPONENT = 107;
+  int STRING_LITERAL = 108;
+  int STRING_2 = 109;
+  int STRING_3 = 110;
+  int ESCAPED = 111;
+  int DOUBLEQUOTE = 112;
+  int DOLLARS = 113;
+  int DOUBLEQUOTE2 = 114;
+  int LBRACE1 = 115;
+  int RBRACE1 = 119;
+  int ID = 120;
+  int DOLLAR = 123;
+  int IDENTIFIER = 124;
+  int LETTER = 125;
+  int DIGIT = 126;
+  int SPECIAL = 127;
+  int LPAREN = 129;
+  int RPAREN = 130;
+  int LBRACE = 131;
+  int RBRACE = 132;
+  int LBRACKET = 133;
+  int RBRACKET = 134;
+  int SEMICOLON = 135;
+  int COMMA = 136;
+  int DOT = 137;
+  int GT = 138;
+  int LT = 139;
+  int EQUAL_EQUAL = 140;
+  int LE = 141;
+  int GE = 142;
+  int NOT_EQUAL = 143;
+  int DIF = 144;
+  int BANGDOUBLEEQUAL = 145;
+  int TRIPLEEQUAL = 146;
+  int ASSIGN = 147;
+  int PLUSASSIGN = 148;
+  int MINUSASSIGN = 149;
+  int STARASSIGN = 150;
+  int SLASHASSIGN = 151;
+  int ANDASSIGN = 152;
+  int ORASSIGN = 153;
+  int XORASSIGN = 154;
+  int DOTASSIGN = 155;
+  int REMASSIGN = 156;
+  int TILDEEQUAL = 157;
+  int LSHIFTASSIGN = 158;
+  int RSIGNEDSHIFTASSIGN = 159;
 
   int DEFAULT = 0;
   int PHPPARSING = 1;
   int IN_SINGLE_LINE_COMMENT = 2;
-  int IN_FORMAL_COMMENT = 3;
-  int IN_MULTI_LINE_COMMENT = 4;
+  int IN_VARIABLE = 3;
+  int IN_FORMAL_COMMENT = 4;
+  int IN_MULTI_LINE_COMMENT = 5;
+  int IN_STRING = 6;
+  int DOLLAR_IN_STRING = 7;
+  int SKIPSTRING = 8;
+  int DOLLAR_IN_STRING_EXPR = 9;
 
   String[] tokenImage = {
     "<EOF>",
-    "<PHPSTART>",
+    "\"<?\"",
+    "\"<?php\"",
+    "\"<?=\"",
     "\"?>\"",
-    "<token of kind 3>",
+    "<token of kind 5>",
+    "\" \"",
+    "\"\\t\"",
+    "\"\\n\"",
+    "\"\\r\"",
+    "\"\\f\"",
     "\" \"",
     "\"\\t\"",
     "\"\\n\"",
     "\"\\r\"",
     "\"\\f\"",
     "\"//\"",
-    "<token of kind 10>",
+    "\"#\"",
+    "<token of kind 18>",
     "\"/*\"",
     "<SINGLE_LINE_COMMENT>",
+    "<token of kind 21>",
+    "\"todo\"",
+    "\"TODO\"",
     "\"*/\"",
     "\"*/\"",
-    "<token of kind 15>",
+    "<token of kind 26>",
     "\"class\"",
     "\"function\"",
     "\"var\"",
@@ -151,6 +183,8 @@ public interface PHPParserConstants {
     "\"elseif\"",
     "\"else\"",
     "\"array\"",
+    "\"break\"",
+    "\"list\"",
     "\"print\"",
     "\"echo\"",
     "\"include\"",
@@ -158,18 +192,17 @@ public interface PHPParserConstants {
     "\"include_once\"",
     "\"require_once\"",
     "\"global\"",
+    "\"define\"",
     "\"static\"",
     "\"->\"",
     "\"::\"",
     "\"=>\"",
-    "\"break\"",
     "\"case\"",
     "\"const\"",
     "\"continue\"",
     "\"default\"",
     "\"do\"",
     "\"extends\"",
-    "\"false\"",
     "\"for\"",
     "\"goto\"",
     "\"new\"",
@@ -179,8 +212,14 @@ public interface PHPParserConstants {
     "\"switch\"",
     "\"this\"",
     "\"true\"",
+    "\"false\"",
     "\"while\"",
     "\"endwhile\"",
+    "\"endswitch\"",
+    "\"endif\"",
+    "\"endfor\"",
+    "\"foreach\"",
+    "\"as\"",
     "\"string\"",
     "\"object\"",
     "\"bool\"",
@@ -190,6 +229,26 @@ public interface PHPParserConstants {
     "\"float\"",
     "\"int\"",
     "\"integer\"",
+    "\"@\"",
+    "\"!\"",
+    "\"~\"",
+    "\"?\"",
+    "\":\"",
+    "\"||\"",
+    "\"&&\"",
+    "\"++\"",
+    "\"--\"",
+    "\"+\"",
+    "\"-\"",
+    "\"*\"",
+    "\"/\"",
+    "\"&\"",
+    "\"|\"",
+    "\"^\"",
+    "\"%\"",
+    "\"<<\"",
+    "\">>\"",
+    "\">>>\"",
     "\"OR\"",
     "\"AND\"",
     "<INTEGER_LITERAL>",
@@ -199,13 +258,26 @@ public interface PHPParserConstants {
     "<FLOATING_POINT_LITERAL>",
     "<EXPONENT>",
     "<STRING_LITERAL>",
-    "<STRING_1>",
     "<STRING_2>",
     "<STRING_3>",
+    "<ESCAPED>",
+    "\"\\\"\"",
+    "\"$\"",
+    "\"\\\"\"",
+    "\"{\"",
+    "\"{\"",
+    "\"}\"",
+    "<token of kind 118>",
+    "\"}\"",
+    "<ID>",
+    "<token of kind 121>",
+    "<token of kind 122>",
+    "\"$\"",
     "<IDENTIFIER>",
     "<LETTER>",
     "<DIGIT>",
-    "\"_\"",
+    "<SPECIAL>",
+    "<token of kind 128>",
     "\"(\"",
     "\")\"",
     "\"{\"",
@@ -215,33 +287,16 @@ public interface PHPParserConstants {
     "\";\"",
     "\",\"",
     "\".\"",
-    "\"@\"",
-    "\"$\"",
-    "\"=\"",
     "\">\"",
     "\"<\"",
-    "\"!\"",
-    "\"?\"",
-    "\":\"",
     "\"==\"",
     "\"<=\"",
     "\">=\"",
     "\"!=\"",
-    "\"||\"",
-    "\"&&\"",
-    "\"++\"",
-    "\"--\"",
-    "\"+\"",
-    "\"-\"",
-    "\"*\"",
-    "\"/\"",
-    "\"&\"",
-    "\"|\"",
-    "\"^\"",
-    "\"%\"",
-    "\"<<\"",
-    "\">>\"",
-    "\">>>\"",
+    "\"<>\"",
+    "\"!==\"",
+    "\"===\"",
+    "\"=\"",
     "\"+=\"",
     "\"-=\"",
     "\"*=\"",
@@ -251,11 +306,9 @@ public interface PHPParserConstants {
     "\"^=\"",
     "\".=\"",
     "\"%=\"",
+    "\"~=\"",
     "\"<<=\"",
     "\">>=\"",
-    "\">>>=\"",
-    "<DOLLAR_ID>",
-    "\"?>\"",
   };
 
 }