From: kpouer <kpouer>
Date: Thu, 6 Mar 2003 21:02:17 +0000 (+0000)
Subject: TokenMgrError handled (no more exception on unterminated String), I now accept all... 
X-Git-Url: http://secure.phpeclipse.com

TokenMgrError handled (no more exception on unterminated String), I now accept all ascii chars from 127 to 255 too
---

diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.java b/net.sourceforge.phpeclipse/src/test/PHPParser.java
index c20eb33..8d922cd 100644
--- a/net.sourceforge.phpeclipse/src/test/PHPParser.java
+++ b/net.sourceforge.phpeclipse/src/test/PHPParser.java
@@ -106,7 +106,12 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
    */
   private static void setMarker(ParseException e) {
     try {
-      setMarker(fileToParse, errorMessage, jj_input_stream.tokenBegin,jj_input_stream.tokenBegin+e.currentToken.image.length(), errorLevel);
+      setMarker(fileToParse,
+                errorMessage,
+                jj_input_stream.tokenBegin,
+                jj_input_stream.tokenBegin + e.currentToken.image.length(),
+                errorLevel,
+                "Line " + e.currentToken.beginLine);
     } catch (CoreException e2) {
       PHPeclipsePlugin.log(e2);
     }
@@ -223,21 +228,27 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
   }
 
   static final public void phpFile() throws ParseException {
-    label_1:
-    while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case PHPSTART:
-        ;
-        break;
-      default:
-        jj_la1[0] = jj_gen;
-        break label_1;
+    try {
+      label_1:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case PHPSTART:
+          ;
+          break;
+        default:
+          jj_la1[0] = jj_gen;
+          break label_1;
+        }
+        jj_consume_token(PHPSTART);
+        Php();
+        jj_consume_token(PHPEND);
       }
-      jj_consume_token(PHPSTART);
-      Php();
-      jj_consume_token(PHPEND);
+      jj_consume_token(0);
+    } catch (TokenMgrError e) {
+    errorMessage = e.getMessage();
+    errorLevel   = ERROR;
+    {if (true) throw generateParseException();}
     }
-    jj_consume_token(0);
   }
 
   static final public void Php() throws ParseException {
@@ -534,6 +545,7 @@ Token token;
 
   static final public String VariableInitializer() throws ParseException {
   String expr;
+  Token token;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case FALSE:
     case NULL:
@@ -544,12 +556,48 @@ Token token;
       expr = Literal();
    {if (true) return expr;}
       break;
+    case MINUS:
+      jj_consume_token(MINUS);
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case INTEGER_LITERAL:
+        token = jj_consume_token(INTEGER_LITERAL);
+        break;
+      case FLOATING_POINT_LITERAL:
+        token = jj_consume_token(FLOATING_POINT_LITERAL);
+        break;
+      default:
+        jj_la1[12] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+   {if (true) return "-" + token.image;}
+      break;
+    case PLUS:
+      jj_consume_token(PLUS);
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case INTEGER_LITERAL:
+        token = jj_consume_token(INTEGER_LITERAL);
+        break;
+      case FLOATING_POINT_LITERAL:
+        token = jj_consume_token(FLOATING_POINT_LITERAL);
+        break;
+      default:
+        jj_la1[13] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+   {if (true) return "+" + token.image;}
+      break;
     case ARRAY:
       expr = ArrayDeclarator();
    {if (true) return expr;}
       break;
+    case IDENTIFIER:
+      token = jj_consume_token(IDENTIFIER);
+   {if (true) return token.image;}
+      break;
     default:
-      jj_la1[12] = jj_gen;
+      jj_la1[14] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -568,7 +616,7 @@ StringBuffer buff = new StringBuffer();
     buff.append("=>").append(expr);
       break;
     default:
-      jj_la1[13] = jj_gen;
+      jj_la1[15] = jj_gen;
       ;
     }
    {if (true) return buff.toString();}
@@ -615,7 +663,7 @@ StringBuffer buff = new StringBuffer("(");
       }
       break;
     default:
-      jj_la1[14] = jj_gen;
+      jj_la1[16] = jj_gen;
       ;
     }
     jj_consume_token(RPAREN);
@@ -645,7 +693,7 @@ StringBuffer buff = new StringBuffer("(");
                methodDeclaration.append("&");
       break;
     default:
-      jj_la1[15] = jj_gen;
+      jj_la1[17] = jj_gen;
       ;
     }
     identifier = jj_consume_token(IDENTIFIER);
@@ -679,7 +727,7 @@ StringBuffer buff = new StringBuffer("(");
           ;
           break;
         default:
-          jj_la1[16] = jj_gen;
+          jj_la1[18] = jj_gen;
           break label_7;
         }
         jj_consume_token(COMMA);
@@ -688,7 +736,7 @@ StringBuffer buff = new StringBuffer("(");
       }
       break;
     default:
-      jj_la1[17] = jj_gen;
+      jj_la1[19] = jj_gen;
       ;
     }
     try {
@@ -712,7 +760,7 @@ StringBuffer buff = new StringBuffer("(");
               buff.append("&");
       break;
     default:
-      jj_la1[18] = jj_gen;
+      jj_la1[20] = jj_gen;
       ;
     }
     variableDeclaration = VariableDeclarator();
@@ -756,7 +804,7 @@ StringBuffer buff = new StringBuffer("(");
    {if (true) return "integer";}
       break;
     default:
-      jj_la1[19] = jj_gen;
+      jj_la1[21] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -805,18 +853,18 @@ StringBuffer buff = new StringBuffer("(");
       case REMASSIGN:
       case LSHIFTASSIGN:
       case RSIGNEDSHIFTASSIGN:
-      case RUNSIGNEDSHIFTASSIGN:
+      case TILDEEQUAL:
         assignOperator = AssignmentOperator();
         try {
           expr2 = Expression();
         } catch (ParseException e) {
       errorMessage = "expression expected";
       errorLevel   = ERROR;
-      {if (true) throw generateParseException();}
+      {if (true) throw e;}
         }
         break;
       default:
-        jj_la1[20] = jj_gen;
+        jj_la1[22] = jj_gen;
         ;
       }
     if (expr2 == null) {
@@ -826,7 +874,7 @@ StringBuffer buff = new StringBuffer("(");
     }
       break;
     default:
-      jj_la1[21] = jj_gen;
+      jj_la1[23] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -867,10 +915,6 @@ StringBuffer buff = new StringBuffer("(");
       jj_consume_token(RSIGNEDSHIFTASSIGN);
  {if (true) return ">>=";}
       break;
-    case RUNSIGNEDSHIFTASSIGN:
-      jj_consume_token(RUNSIGNEDSHIFTASSIGN);
- {if (true) return ">>>=";}
-      break;
     case ANDASSIGN:
       jj_consume_token(ANDASSIGN);
  {if (true) return "&=";}
@@ -887,8 +931,12 @@ StringBuffer buff = new StringBuffer("(");
       jj_consume_token(DOTASSIGN);
  {if (true) return ".=";}
       break;
+    case TILDEEQUAL:
+      jj_consume_token(TILDEEQUAL);
+ {if (true) return "~=";}
+      break;
     default:
-      jj_la1[22] = jj_gen;
+      jj_la1[24] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -908,7 +956,7 @@ StringBuffer buff = new StringBuffer("(");
       expr3 = ConditionalExpression();
       break;
     default:
-      jj_la1[23] = jj_gen;
+      jj_la1[25] = jj_gen;
       ;
     }
   if (expr3 == null) {
@@ -934,7 +982,7 @@ StringBuffer buff = new StringBuffer("(");
         ;
         break;
       default:
-        jj_la1[24] = jj_gen;
+        jj_la1[26] = jj_gen;
         break label_8;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -945,7 +993,7 @@ StringBuffer buff = new StringBuffer("(");
         operator = jj_consume_token(_ORL);
         break;
       default:
-        jj_la1[25] = jj_gen;
+        jj_la1[27] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -972,7 +1020,7 @@ StringBuffer buff = new StringBuffer("(");
         ;
         break;
       default:
-        jj_la1[26] = jj_gen;
+        jj_la1[28] = jj_gen;
         break label_9;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -983,7 +1031,7 @@ StringBuffer buff = new StringBuffer("(");
         operator = jj_consume_token(_ANDL);
         break;
       default:
-        jj_la1[27] = jj_gen;
+        jj_la1[29] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -1008,7 +1056,7 @@ StringBuffer buff = new StringBuffer("(");
         ;
         break;
       default:
-        jj_la1[28] = jj_gen;
+        jj_la1[30] = jj_gen;
         break label_10;
       }
       jj_consume_token(DOT);
@@ -1033,7 +1081,7 @@ StringBuffer buff = new StringBuffer("(");
         ;
         break;
       default:
-        jj_la1[29] = jj_gen;
+        jj_la1[31] = jj_gen;
         break label_11;
       }
       jj_consume_token(BIT_OR);
@@ -1058,7 +1106,7 @@ StringBuffer buff = new StringBuffer("(");
         ;
         break;
       default:
-        jj_la1[30] = jj_gen;
+        jj_la1[32] = jj_gen;
         break label_12;
       }
       jj_consume_token(XOR);
@@ -1083,7 +1131,7 @@ StringBuffer buff = new StringBuffer("(");
         ;
         break;
       default:
-        jj_la1[31] = jj_gen;
+        jj_la1[33] = jj_gen;
         break label_13;
       }
       jj_consume_token(BIT_AND);
@@ -1107,10 +1155,12 @@ StringBuffer buff = new StringBuffer("(");
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case EQ:
       case NE:
+      case BANGDOUBLEEQUAL:
+      case TRIPLEEQUAL:
         ;
         break;
       default:
-        jj_la1[32] = jj_gen;
+        jj_la1[34] = jj_gen;
         break label_14;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1120,8 +1170,14 @@ StringBuffer buff = new StringBuffer("(");
       case NE:
         operator = jj_consume_token(NE);
         break;
+      case BANGDOUBLEEQUAL:
+        operator = jj_consume_token(BANGDOUBLEEQUAL);
+        break;
+      case TRIPLEEQUAL:
+        operator = jj_consume_token(TRIPLEEQUAL);
+        break;
       default:
-        jj_la1[33] = jj_gen;
+        jj_la1[35] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -1150,7 +1206,7 @@ StringBuffer buff = new StringBuffer("(");
         ;
         break;
       default:
-        jj_la1[34] = jj_gen;
+        jj_la1[36] = jj_gen;
         break label_15;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1167,7 +1223,7 @@ StringBuffer buff = new StringBuffer("(");
         operator = jj_consume_token(GE);
         break;
       default:
-        jj_la1[35] = jj_gen;
+        jj_la1[37] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -1195,7 +1251,7 @@ StringBuffer buff = new StringBuffer("(");
         ;
         break;
       default:
-        jj_la1[36] = jj_gen;
+        jj_la1[38] = jj_gen;
         break label_16;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1209,7 +1265,7 @@ StringBuffer buff = new StringBuffer("(");
         operator = jj_consume_token(RUNSIGNEDSHIFT);
         break;
       default:
-        jj_la1[37] = jj_gen;
+        jj_la1[39] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -1236,7 +1292,7 @@ StringBuffer buff = new StringBuffer("(");
         ;
         break;
       default:
-        jj_la1[38] = jj_gen;
+        jj_la1[40] = jj_gen;
         break label_17;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1247,7 +1303,7 @@ StringBuffer buff = new StringBuffer("(");
         operator = jj_consume_token(MINUS);
         break;
       default:
-        jj_la1[39] = jj_gen;
+        jj_la1[41] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -1274,7 +1330,7 @@ StringBuffer buff = new StringBuffer("(");
         ;
         break;
       default:
-        jj_la1[40] = jj_gen;
+        jj_la1[42] = jj_gen;
         break label_18;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1288,7 +1344,7 @@ StringBuffer buff = new StringBuffer("(");
         operator = jj_consume_token(REM);
         break;
       default:
-        jj_la1[41] = jj_gen;
+        jj_la1[43] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -1300,15 +1356,68 @@ StringBuffer buff = new StringBuffer("(");
     throw new Error("Missing return statement in function");
   }
 
+/**
+ * An unary expression starting with @, & or nothing
+ */
   static final public String UnaryExpression() throws ParseException {
   String expr;
   Token token;
+  final StringBuffer buff = new StringBuffer();
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case BIT_AND:
+      token = jj_consume_token(BIT_AND);
+      expr = UnaryExpressionNoPrefix();
+    if (token == null) {
+      {if (true) return expr;}
+    }
+    {if (true) return token.image + expr;}
+      break;
+    case ARRAY:
+    case FALSE:
+    case NEW:
+    case NULL:
+    case TRUE:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case STRING_LITERAL:
+    case IDENTIFIER:
+    case LPAREN:
     case AT:
-      jj_consume_token(AT);
-      expr = UnaryExpression();
-   {if (true) return "@" + expr;}
+    case DOLLAR:
+    case BANG:
+    case INCR:
+    case DECR:
+    case PLUS:
+    case MINUS:
+    case DOLLAR_ID:
+      label_19:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case AT:
+          ;
+          break;
+        default:
+          jj_la1[44] = jj_gen;
+          break label_19;
+        }
+        jj_consume_token(AT);
+         buff.append("@");
+      }
+      expr = UnaryExpressionNoPrefix();
+   {if (true) return buff.append(expr).toString();}
       break;
+    default:
+      jj_la1[45] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    throw new Error("Missing return statement in function");
+  }
+
+  static final public String UnaryExpressionNoPrefix() throws ParseException {
+  String expr;
+  Token token;
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case PLUS:
     case MINUS:
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1319,7 +1428,7 @@ StringBuffer buff = new StringBuffer("(");
         token = jj_consume_token(MINUS);
         break;
       default:
-        jj_la1[42] = jj_gen;
+        jj_la1[46] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -1346,13 +1455,12 @@ StringBuffer buff = new StringBuffer("(");
     case LPAREN:
     case DOLLAR:
     case BANG:
-    case BIT_AND:
     case DOLLAR_ID:
       expr = UnaryExpressionNotPlusMinus();
    {if (true) return expr;}
       break;
     default:
-      jj_la1[43] = jj_gen;
+      jj_la1[47] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1384,7 +1492,7 @@ String expr;
    {if (true) return "!" + expr;}
       break;
     default:
-      jj_la1[44] = jj_gen;
+      jj_la1[48] = jj_gen;
       if (jj_2_3(2147483647)) {
         expr = CastExpression();
    {if (true) return expr;}
@@ -1394,7 +1502,6 @@ String expr;
         case NEW:
         case IDENTIFIER:
         case DOLLAR:
-        case BIT_AND:
         case DOLLAR_ID:
           expr = PostfixExpression();
    {if (true) return expr;}
@@ -1415,7 +1522,7 @@ String expr;
    {if (true) return "("+expr+")";}
           break;
         default:
-          jj_la1[45] = jj_gen;
+          jj_la1[49] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -1450,13 +1557,13 @@ String expr;
         operator = jj_consume_token(DECR);
         break;
       default:
-        jj_la1[46] = jj_gen;
+        jj_la1[50] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
       break;
     default:
-      jj_la1[47] = jj_gen;
+      jj_la1[51] = jj_gen;
       ;
     }
     if (operator == null) {
@@ -1475,7 +1582,7 @@ String expr;
       jj_consume_token(STATICCLASSACCESS);
       expr = ClassIdentifier();
    buff.append(identifier.image).append("::").append(expr);
-      label_19:
+      label_20:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case CLASSACCESS:
@@ -1484,8 +1591,8 @@ String expr;
           ;
           break;
         default:
-          jj_la1[48] = jj_gen;
-          break label_19;
+          jj_la1[52] = jj_gen;
+          break label_20;
         }
         expr = PrimarySuffix();
    buff.append(expr);
@@ -1496,11 +1603,10 @@ String expr;
       case NEW:
       case IDENTIFIER:
       case DOLLAR:
-      case BIT_AND:
       case DOLLAR_ID:
         expr = PrimaryPrefix();
                            buff.append(expr);
-        label_20:
+        label_21:
         while (true) {
           switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
           case CLASSACCESS:
@@ -1509,8 +1615,8 @@ String expr;
             ;
             break;
           default:
-            jj_la1[49] = jj_gen;
-            break label_20;
+            jj_la1[53] = jj_gen;
+            break label_21;
           }
           expr = PrimarySuffix();
                              buff.append(expr);
@@ -1522,7 +1628,7 @@ String expr;
    {if (true) return "array" + expr;}
         break;
       default:
-        jj_la1[50] = jj_gen;
+        jj_la1[54] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -1547,21 +1653,9 @@ String expr;
    {if (true) return token.image;}
       break;
     case NEW:
-    case BIT_AND:
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case BIT_AND:
-        token = jj_consume_token(BIT_AND);
-        break;
-      default:
-        jj_la1[51] = jj_gen;
-        ;
-      }
       jj_consume_token(NEW);
       expr = ClassIdentifier();
-    if (token == null) {
-      {if (true) return "new " + expr;}
-    }
-    {if (true) return "new &" + expr;}
+    {if (true) return "new " + expr;}
       break;
     case DOLLAR:
     case DOLLAR_ID:
@@ -1569,7 +1663,7 @@ String expr;
    {if (true) return expr;}
       break;
     default:
-      jj_la1[52] = jj_gen;
+      jj_la1[55] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1590,7 +1684,7 @@ String expr;
    {if (true) return expr;}
       break;
     default:
-      jj_la1[53] = jj_gen;
+      jj_la1[56] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1610,7 +1704,7 @@ String expr;
    {if (true) return expr;}
       break;
     default:
-      jj_la1[54] = jj_gen;
+      jj_la1[57] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1651,7 +1745,7 @@ String expr;
         expr = Expression();
         break;
       default:
-        jj_la1[55] = jj_gen;
+        jj_la1[58] = jj_gen;
         ;
       }
       try {
@@ -1659,7 +1753,7 @@ String expr;
       } catch (ParseException e) {
     errorMessage = "']' expected";
     errorLevel   = ERROR;
-    {if (true) throw generateParseException();}
+    {if (true) throw e;}
       }
     if(expr == null) {
       {if (true) return "[]";}
@@ -1667,7 +1761,7 @@ String expr;
     {if (true) return "[" + expr + "]";}
       break;
     default:
-      jj_la1[56] = jj_gen;
+      jj_la1[59] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1687,14 +1781,8 @@ String expr;
    {if (true) return token.image;}
       break;
     case STRING_LITERAL:
-      try {
-        token = jj_consume_token(STRING_LITERAL);
+      token = jj_consume_token(STRING_LITERAL);
    {if (true) return token.image;}
-      } catch (TokenMgrError e) {
-    errorMessage = "unterminated string";
-    errorLevel   = ERROR;
-    {if (true) throw generateParseException();}
-      }
       break;
     case FALSE:
     case TRUE:
@@ -1706,7 +1794,7 @@ String expr;
    {if (true) return expr;}
       break;
     default:
-      jj_la1[57] = jj_gen;
+      jj_la1[60] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1724,7 +1812,7 @@ String expr;
    {if (true) return "false";}
       break;
     default:
-      jj_la1[58] = jj_gen;
+      jj_la1[61] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1764,7 +1852,7 @@ String expr = null;
       expr = ArgumentList();
       break;
     default:
-      jj_la1[59] = jj_gen;
+      jj_la1[62] = jj_gen;
       ;
     }
     try {
@@ -1786,15 +1874,15 @@ String expr;
 StringBuffer buff = new StringBuffer();
     expr = Expression();
    buff.append(expr);
-    label_21:
+    label_22:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case COMMA:
         ;
         break;
       default:
-        jj_la1[60] = jj_gen;
-        break label_21;
+        jj_la1[63] = jj_gen;
+        break label_22;
       }
       jj_consume_token(COMMA);
       try {
@@ -1821,11 +1909,11 @@ StringBuffer buff = new StringBuffer();
         case SEMICOLON:
           jj_consume_token(SEMICOLON);
           break;
-        case 127:
-          jj_consume_token(127);
+        case 129:
+          jj_consume_token(129);
           break;
         default:
-          jj_la1[61] = jj_gen;
+          jj_la1[64] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -1850,7 +1938,6 @@ StringBuffer buff = new StringBuffer();
       case DOLLAR:
       case INCR:
       case DECR:
-      case BIT_AND:
       case DOLLAR_ID:
         StatementExpression();
         try {
@@ -1898,7 +1985,7 @@ StringBuffer buff = new StringBuffer();
           jj_consume_token(AT);
           break;
         default:
-          jj_la1[62] = jj_gen;
+          jj_la1[65] = jj_gen;
           ;
         }
         IncludeStatement();
@@ -1910,7 +1997,7 @@ StringBuffer buff = new StringBuffer();
         GlobalStatement();
         break;
       default:
-        jj_la1[63] = jj_gen;
+        jj_la1[66] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -1930,11 +2017,11 @@ StringBuffer buff = new StringBuffer();
         case SEMICOLON:
           jj_consume_token(SEMICOLON);
           break;
-        case 127:
-          jj_consume_token(127);
+        case 129:
+          jj_consume_token(129);
           break;
         default:
-          jj_la1[64] = jj_gen;
+          jj_la1[67] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -1953,11 +2040,11 @@ StringBuffer buff = new StringBuffer();
         case SEMICOLON:
           jj_consume_token(SEMICOLON);
           break;
-        case 127:
-          jj_consume_token(127);
+        case 129:
+          jj_consume_token(129);
           break;
         default:
-          jj_la1[65] = jj_gen;
+          jj_la1[68] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -1976,11 +2063,11 @@ StringBuffer buff = new StringBuffer();
         case SEMICOLON:
           jj_consume_token(SEMICOLON);
           break;
-        case 127:
-          jj_consume_token(127);
+        case 129:
+          jj_consume_token(129);
           break;
         default:
-          jj_la1[66] = jj_gen;
+          jj_la1[69] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -1999,11 +2086,11 @@ StringBuffer buff = new StringBuffer();
         case SEMICOLON:
           jj_consume_token(SEMICOLON);
           break;
-        case 127:
-          jj_consume_token(127);
+        case 129:
+          jj_consume_token(129);
           break;
         default:
-          jj_la1[67] = jj_gen;
+          jj_la1[70] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -2014,7 +2101,7 @@ StringBuffer buff = new StringBuffer();
       }
       break;
     default:
-      jj_la1[68] = jj_gen;
+      jj_la1[71] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2033,15 +2120,15 @@ StringBuffer buff = new StringBuffer();
   static final public void EchoStatement() throws ParseException {
     jj_consume_token(ECHO);
     Expression();
-    label_22:
+    label_23:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case COMMA:
         ;
         break;
       default:
-        jj_la1[69] = jj_gen;
-        break label_22;
+        jj_la1[72] = jj_gen;
+        break label_23;
       }
       jj_consume_token(COMMA);
       Expression();
@@ -2051,11 +2138,11 @@ StringBuffer buff = new StringBuffer();
       case SEMICOLON:
         jj_consume_token(SEMICOLON);
         break;
-      case 127:
-        jj_consume_token(127);
+      case 129:
+        jj_consume_token(129);
         break;
       default:
-        jj_la1[70] = jj_gen;
+        jj_la1[73] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2069,15 +2156,15 @@ StringBuffer buff = new StringBuffer();
   static final public void GlobalStatement() throws ParseException {
     jj_consume_token(GLOBAL);
     VariableDeclaratorId();
-    label_23:
+    label_24:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case COMMA:
         ;
         break;
       default:
-        jj_la1[71] = jj_gen;
-        break label_23;
+        jj_la1[74] = jj_gen;
+        break label_24;
       }
       jj_consume_token(COMMA);
       VariableDeclaratorId();
@@ -2087,11 +2174,11 @@ StringBuffer buff = new StringBuffer();
       case SEMICOLON:
         jj_consume_token(SEMICOLON);
         break;
-      case 127:
-        jj_consume_token(127);
+      case 129:
+        jj_consume_token(129);
         break;
       default:
-        jj_la1[72] = jj_gen;
+        jj_la1[75] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2105,15 +2192,15 @@ StringBuffer buff = new StringBuffer();
   static final public void StaticStatement() throws ParseException {
     jj_consume_token(STATIC);
     VariableDeclarator();
-    label_24:
+    label_25:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case COMMA:
         ;
         break;
       default:
-        jj_la1[73] = jj_gen;
-        break label_24;
+        jj_la1[76] = jj_gen;
+        break label_25;
       }
       jj_consume_token(COMMA);
       VariableDeclarator();
@@ -2123,11 +2210,11 @@ StringBuffer buff = new StringBuffer();
       case SEMICOLON:
         jj_consume_token(SEMICOLON);
         break;
-      case 127:
-        jj_consume_token(127);
+      case 129:
+        jj_consume_token(129);
         break;
       default:
-        jj_la1[74] = jj_gen;
+        jj_la1[77] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2152,7 +2239,7 @@ StringBuffer buff = new StringBuffer();
     errorLevel   = ERROR;
     {if (true) throw e;}
     }
-    label_25:
+    label_26:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case CLASS:
@@ -2197,8 +2284,8 @@ StringBuffer buff = new StringBuffer();
         ;
         break;
       default:
-        jj_la1[75] = jj_gen;
-        break label_25;
+        jj_la1[78] = jj_gen;
+        break label_26;
       }
       BlockStatement();
     }
@@ -2253,7 +2340,7 @@ StringBuffer buff = new StringBuffer();
       MethodDeclaration();
       break;
     default:
-      jj_la1[76] = jj_gen;
+      jj_la1[79] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2261,15 +2348,15 @@ StringBuffer buff = new StringBuffer();
 
   static final public void LocalVariableDeclaration() throws ParseException {
     VariableDeclarator();
-    label_26:
+    label_27:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case COMMA:
         ;
         break;
       default:
-        jj_la1[77] = jj_gen;
-        break label_26;
+        jj_la1[80] = jj_gen;
+        break label_27;
       }
       jj_consume_token(COMMA);
       VariableDeclarator();
@@ -2292,7 +2379,6 @@ StringBuffer buff = new StringBuffer();
     case NEW:
     case IDENTIFIER:
     case DOLLAR:
-    case BIT_AND:
     case DOLLAR_ID:
       PrimaryExpression();
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -2310,7 +2396,7 @@ StringBuffer buff = new StringBuffer();
       case REMASSIGN:
       case LSHIFTASSIGN:
       case RSIGNEDSHIFTASSIGN:
-      case RUNSIGNEDSHIFTASSIGN:
+      case TILDEEQUAL:
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case INCR:
           jj_consume_token(INCR);
@@ -2330,23 +2416,23 @@ StringBuffer buff = new StringBuffer();
         case REMASSIGN:
         case LSHIFTASSIGN:
         case RSIGNEDSHIFTASSIGN:
-        case RUNSIGNEDSHIFTASSIGN:
+        case TILDEEQUAL:
           AssignmentOperator();
           Expression();
           break;
         default:
-          jj_la1[78] = jj_gen;
+          jj_la1[81] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
         break;
       default:
-        jj_la1[79] = jj_gen;
+        jj_la1[82] = jj_gen;
         ;
       }
       break;
     default:
-      jj_la1[80] = jj_gen;
+      jj_la1[83] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2358,7 +2444,7 @@ StringBuffer buff = new StringBuffer();
     Expression();
     jj_consume_token(RPAREN);
     jj_consume_token(LBRACE);
-    label_27:
+    label_28:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case CASE:
@@ -2366,11 +2452,11 @@ StringBuffer buff = new StringBuffer();
         ;
         break;
       default:
-        jj_la1[81] = jj_gen;
-        break label_27;
+        jj_la1[84] = jj_gen;
+        break label_28;
       }
       SwitchLabel();
-      label_28:
+      label_29:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case CLASS:
@@ -2415,8 +2501,8 @@ StringBuffer buff = new StringBuffer();
           ;
           break;
         default:
-          jj_la1[82] = jj_gen;
-          break label_28;
+          jj_la1[85] = jj_gen;
+          break label_29;
         }
         BlockStatement();
       }
@@ -2436,7 +2522,7 @@ StringBuffer buff = new StringBuffer();
       jj_consume_token(COLON);
       break;
     default:
-      jj_la1[83] = jj_gen;
+      jj_la1[86] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2446,15 +2532,15 @@ StringBuffer buff = new StringBuffer();
     jj_consume_token(IF);
     Condition("if");
     Statement();
-    label_29:
+    label_30:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case ELSEIF:
         ;
         break;
       default:
-        jj_la1[84] = jj_gen;
-        break label_29;
+        jj_la1[87] = jj_gen;
+        break label_30;
       }
       ElseIfStatement();
     }
@@ -2464,7 +2550,7 @@ StringBuffer buff = new StringBuffer();
       Statement();
       break;
     default:
-      jj_la1[85] = jj_gen;
+      jj_la1[88] = jj_gen;
       ;
     }
   }
@@ -2503,7 +2589,7 @@ StringBuffer buff = new StringBuffer();
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case COLON:
       jj_consume_token(COLON);
-      label_30:
+      label_31:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case IF:
@@ -2546,8 +2632,8 @@ StringBuffer buff = new StringBuffer();
           ;
           break;
         default:
-          jj_la1[86] = jj_gen;
-          break label_30;
+          jj_la1[89] = jj_gen;
+          break label_31;
         }
         Statement();
       }
@@ -2557,11 +2643,11 @@ StringBuffer buff = new StringBuffer();
         case SEMICOLON:
           jj_consume_token(SEMICOLON);
           break;
-        case 127:
-          jj_consume_token(127);
+        case 129:
+          jj_consume_token(129);
           break;
         default:
-          jj_la1[87] = jj_gen;
+          jj_la1[90] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -2611,7 +2697,7 @@ StringBuffer buff = new StringBuffer();
       Statement();
       break;
     default:
-      jj_la1[88] = jj_gen;
+      jj_la1[91] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2627,11 +2713,11 @@ StringBuffer buff = new StringBuffer();
       case SEMICOLON:
         jj_consume_token(SEMICOLON);
         break;
-      case 127:
-        jj_consume_token(127);
+      case 129:
+        jj_consume_token(129);
         break;
       default:
-        jj_la1[89] = jj_gen;
+        jj_la1[92] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2652,12 +2738,11 @@ StringBuffer buff = new StringBuffer();
     case DOLLAR:
     case INCR:
     case DECR:
-    case BIT_AND:
     case DOLLAR_ID:
       ForInit();
       break;
     default:
-      jj_la1[90] = jj_gen;
+      jj_la1[93] = jj_gen;
       ;
     }
     jj_consume_token(SEMICOLON);
@@ -2685,7 +2770,7 @@ StringBuffer buff = new StringBuffer();
       Expression();
       break;
     default:
-      jj_la1[91] = jj_gen;
+      jj_la1[94] = jj_gen;
       ;
     }
     jj_consume_token(SEMICOLON);
@@ -2696,12 +2781,11 @@ StringBuffer buff = new StringBuffer();
     case DOLLAR:
     case INCR:
     case DECR:
-    case BIT_AND:
     case DOLLAR_ID:
       ForUpdate();
       break;
     default:
-      jj_la1[92] = jj_gen;
+      jj_la1[95] = jj_gen;
       ;
     }
     jj_consume_token(RPAREN);
@@ -2719,12 +2803,11 @@ StringBuffer buff = new StringBuffer();
       case DOLLAR:
       case INCR:
       case DECR:
-      case BIT_AND:
       case DOLLAR_ID:
         StatementExpressionList();
         break;
       default:
-        jj_la1[93] = jj_gen;
+        jj_la1[96] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2733,15 +2816,15 @@ StringBuffer buff = new StringBuffer();
 
   static final public void StatementExpressionList() throws ParseException {
     StatementExpression();
-    label_31:
+    label_32:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case COMMA:
         ;
         break;
       default:
-        jj_la1[94] = jj_gen;
-        break label_31;
+        jj_la1[97] = jj_gen;
+        break label_32;
       }
       jj_consume_token(COMMA);
       StatementExpression();
@@ -2759,7 +2842,7 @@ StringBuffer buff = new StringBuffer();
       jj_consume_token(IDENTIFIER);
       break;
     default:
-      jj_la1[95] = jj_gen;
+      jj_la1[98] = jj_gen;
       ;
     }
     jj_consume_token(SEMICOLON);
@@ -2772,7 +2855,7 @@ StringBuffer buff = new StringBuffer();
       jj_consume_token(IDENTIFIER);
       break;
     default:
-      jj_la1[96] = jj_gen;
+      jj_la1[99] = jj_gen;
       ;
     }
     jj_consume_token(SEMICOLON);
@@ -2804,7 +2887,7 @@ StringBuffer buff = new StringBuffer();
       Expression();
       break;
     default:
-      jj_la1[97] = jj_gen;
+      jj_la1[100] = jj_gen;
       ;
     }
     jj_consume_token(SEMICOLON);
@@ -2859,341 +2942,367 @@ StringBuffer buff = new StringBuffer();
     return retval;
   }
 
-  static final private boolean jj_3R_135() {
-    if (jj_scan_token(RSIGNEDSHIFT)) return true;
+  static final private boolean jj_3R_102() {
+    if (jj_scan_token(FLOATING_POINT_LITERAL)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_139() {
-    if (jj_scan_token(PLUS)) return true;
+  static final private boolean jj_3R_100() {
+    if (jj_scan_token(FLOATING_POINT_LITERAL)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_133() {
+  static final private boolean jj_3R_113() {
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_139()) {
-    jj_scanpos = xsp;
-    if (jj_3R_140()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_132()) return true;
+    if (jj_3R_120()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_scan_token(RPAREN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_130() {
-    if (jj_scan_token(LE)) return true;
+  static final private boolean jj_3R_38() {
+    if (jj_scan_token(129)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_126() {
-    if (jj_3R_132()) return true;
+  static final private boolean jj_3R_138() {
+    if (jj_scan_token(LT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_133()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
     return false;
   }
 
-  static final private boolean jj_3_2() {
-    if (jj_scan_token(COMMA)) return true;
+  static final private boolean jj_3R_127() {
+    if (jj_scan_token(ARRAYASSIGN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_33()) return true;
+    if (jj_3R_36()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_112() {
-    if (jj_3R_33()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3_2()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
-    return false;
-  }
-
-  static final private boolean jj_3R_134() {
-    if (jj_scan_token(LSHIFT)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_127() {
+  static final private boolean jj_3R_131() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_134()) {
+    if (jj_3R_138()) {
     jj_scanpos = xsp;
-    if (jj_3R_135()) {
+    if (jj_3R_139()) {
     jj_scanpos = xsp;
-    if (jj_3R_136()) return true;
+    if (jj_3R_140()) {
+    jj_scanpos = xsp;
+    if (jj_3R_141()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_126()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_129() {
-    if (jj_scan_token(GT)) return true;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_130()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_122() {
-    if (jj_3R_126()) return true;
+  static final private boolean jj_3R_128() {
+    if (jj_3R_130()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_127()) { jj_scanpos = xsp; break; }
+      if (jj_3R_131()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_105() {
-    if (jj_scan_token(LPAREN)) return true;
+  static final private boolean jj_3R_34() {
+    if (jj_3R_36()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_112()) jj_scanpos = xsp;
+    if (jj_3R_127()) jj_scanpos = xsp;
     else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(RPAREN)) return true;
+    return false;
+  }
+
+  static final private boolean jj_3_6() {
+    if (jj_3R_39()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_119() {
-    if (jj_scan_token(ARRAYASSIGN)) return true;
+  static final private boolean jj_3R_37() {
+    if (jj_scan_token(SEMICOLON)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_35()) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_101() {
+    if (jj_scan_token(INTEGER_LITERAL)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_128() {
-    if (jj_scan_token(LT)) return true;
+  static final private boolean jj_3R_92() {
+    if (jj_scan_token(IDENTIFIER)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_33() {
-    if (jj_3R_35()) return true;
+  static final private boolean jj_3R_99() {
+    if (jj_scan_token(INTEGER_LITERAL)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_119()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_123() {
+  static final private boolean jj_3R_91() {
+    if (jj_3R_103()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3_5() {
+    if (jj_3R_36()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_128()) {
-    jj_scanpos = xsp;
-    if (jj_3R_129()) {
-    jj_scanpos = xsp;
-    if (jj_3R_130()) {
+    if (jj_3R_37()) {
     jj_scanpos = xsp;
-    if (jj_3R_131()) return true;
+    if (jj_3R_38()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_122()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_125() {
-    if (jj_scan_token(NE)) return true;
+  static final private boolean jj_3R_135() {
+    if (jj_scan_token(TRIPLEEQUAL)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_120() {
-    if (jj_3R_122()) return true;
+  static final private boolean jj_3R_134() {
+    if (jj_scan_token(BANGDOUBLEEQUAL)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_123()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
     return false;
   }
 
-  static final private boolean jj_3R_109() {
-    if (jj_3R_54()) return true;
+  static final private boolean jj_3R_90() {
+    if (jj_scan_token(PLUS)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_101()) {
+    jj_scanpos = xsp;
+    if (jj_3R_102()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_37() {
-    if (jj_scan_token(127)) return true;
+  static final private boolean jj_3R_117() {
+    if (jj_3R_55()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_88() {
-    if (jj_3R_95()) return true;
+  static final private boolean jj_3R_133() {
+    if (jj_scan_token(NE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_87() {
-    if (jj_3R_94()) return true;
+  static final private boolean jj_3R_132() {
+    if (jj_scan_token(EQ)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_69() {
+  static final private boolean jj_3R_89() {
+    if (jj_scan_token(MINUS)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_87()) {
+    if (jj_3R_99()) {
     jj_scanpos = xsp;
-    if (jj_3R_88()) return true;
+    if (jj_3R_100()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_108() {
-    if (jj_scan_token(LBRACE)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_35()) return true;
+  static final private boolean jj_3R_129() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_132()) {
+    jj_scanpos = xsp;
+    if (jj_3R_133()) {
+    jj_scanpos = xsp;
+    if (jj_3R_134()) {
+    jj_scanpos = xsp;
+    if (jj_3R_135()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(RBRACE)) return true;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_128()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_124() {
-    if (jj_scan_token(EQ)) return true;
+  static final private boolean jj_3R_88() {
+    if (jj_3R_98()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3_6() {
-    if (jj_3R_38()) return true;
+  static final private boolean jj_3R_70() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_88()) {
+    jj_scanpos = xsp;
+    if (jj_3R_89()) {
+    jj_scanpos = xsp;
+    if (jj_3R_90()) {
+    jj_scanpos = xsp;
+    if (jj_3R_91()) {
+    jj_scanpos = xsp;
+    if (jj_3R_92()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_121() {
+  static final private boolean jj_3R_125() {
+    if (jj_3R_128()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_124()) {
-    jj_scanpos = xsp;
-    if (jj_3R_125()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_129()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
+    return false;
+  }
+
+  static final private boolean jj_3R_116() {
+    if (jj_scan_token(LBRACE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_120()) return true;
+    if (jj_3R_36()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_scan_token(RBRACE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_36() {
-    if (jj_scan_token(SEMICOLON)) return true;
+  static final private boolean jj_3R_195() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_36()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_117() {
-    if (jj_3R_120()) return true;
+  static final private boolean jj_3R_194() {
+    if (jj_3R_36()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_121()) { jj_scanpos = xsp; break; }
+      if (jj_3R_195()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_64() {
+  static final private boolean jj_3R_65() {
     if (jj_scan_token(DOLLAR_ID)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_109()) jj_scanpos = xsp;
+    if (jj_3R_117()) jj_scanpos = xsp;
     else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3_5() {
-    if (jj_3R_35()) return true;
+  static final private boolean jj_3R_64() {
+    if (jj_scan_token(DOLLAR)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_36()) {
-    jj_scanpos = xsp;
-    if (jj_3R_37()) return true;
+    if (jj_3R_55()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_63() {
-    if (jj_scan_token(DOLLAR)) return true;
+  static final private boolean jj_3R_126() {
+    if (jj_scan_token(BIT_AND)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_54()) return true;
+    if (jj_3R_125()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_93() {
+  static final private boolean jj_3R_193() {
+    if (jj_3R_194()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_63() {
+    if (jj_scan_token(IDENTIFIER)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_116()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_97() {
     if (jj_scan_token(LBRACE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_35()) return true;
+    if (jj_3R_36()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     if (jj_scan_token(RBRACE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_62() {
-    if (jj_scan_token(IDENTIFIER)) return true;
+  static final private boolean jj_3R_121() {
+    if (jj_3R_125()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_108()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_126()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
     return false;
   }
 
-  static final private boolean jj_3R_61() {
+  static final private boolean jj_3R_62() {
     if (jj_scan_token(LBRACE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_35()) return true;
+    if (jj_3R_36()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     if (jj_scan_token(RBRACE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_54() {
+  static final private boolean jj_3R_55() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_61()) {
-    jj_scanpos = xsp;
     if (jj_3R_62()) {
     jj_scanpos = xsp;
     if (jj_3R_63()) {
     jj_scanpos = xsp;
-    if (jj_3R_64()) return true;
+    if (jj_3R_64()) {
+    jj_scanpos = xsp;
+    if (jj_3R_65()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -3201,506 +3310,549 @@ StringBuffer buff = new StringBuffer();
     return false;
   }
 
-  static final private boolean jj_3R_118() {
-    if (jj_scan_token(BIT_AND)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_117()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_113() {
-    if (jj_3R_117()) return true;
+  static final private boolean jj_3R_191() {
+    if (jj_scan_token(LPAREN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_118()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
+    xsp = jj_scanpos;
+    if (jj_3R_193()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_scan_token(RPAREN)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_183() {
-    if (jj_scan_token(COMMA)) return true;
+  static final private boolean jj_3R_87() {
+    if (jj_scan_token(DOLLAR)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_35()) return true;
+    if (jj_3R_55()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_86() {
-    if (jj_scan_token(DOLLAR)) return true;
+  static final private boolean jj_3R_122() {
+    if (jj_scan_token(XOR)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_54()) return true;
+    if (jj_3R_121()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_182() {
-    if (jj_3R_35()) return true;
+  static final private boolean jj_3R_119() {
+    if (jj_scan_token(NULL)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_183()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
     return false;
   }
 
-  static final private boolean jj_3R_85() {
+  static final private boolean jj_3R_86() {
     if (jj_scan_token(DOLLAR_ID)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_93()) jj_scanpos = xsp;
+    if (jj_3R_97()) jj_scanpos = xsp;
     else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_68() {
+  static final private boolean jj_3R_69() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_85()) {
+    if (jj_3R_86()) {
     jj_scanpos = xsp;
-    if (jj_3R_86()) return true;
+    if (jj_3R_87()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_181() {
-    if (jj_3R_182()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
   static final private boolean jj_3R_114() {
-    if (jj_scan_token(XOR)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_113()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_106() {
-    if (jj_3R_113()) return true;
+    if (jj_3R_121()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_114()) { jj_scanpos = xsp; break; }
+      if (jj_3R_122()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3_1() {
-    if (jj_3R_32()) return true;
+  static final private boolean jj_3R_124() {
+    if (jj_scan_token(FALSE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_179() {
-    if (jj_scan_token(LPAREN)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_181()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(RPAREN)) return true;
+  static final private boolean jj_3_7() {
+    if (jj_3R_40()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_59() {
-    if (jj_3R_68()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+  static final private boolean jj_3R_118() {
     Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3_1()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
+    xsp = jj_scanpos;
+    if (jj_3R_123()) {
+    jj_scanpos = xsp;
+    if (jj_3R_124()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_111() {
-    if (jj_scan_token(NULL)) return true;
+  static final private boolean jj_3R_123() {
+    if (jj_scan_token(TRUE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_107() {
-    if (jj_scan_token(BIT_OR)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_106()) return true;
+  static final private boolean jj_3_1() {
+    if (jj_3R_33()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_116() {
-    if (jj_scan_token(FALSE)) return true;
+  static final private boolean jj_3R_112() {
+    if (jj_3R_119()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3_7() {
-    if (jj_3R_39()) return true;
+  static final private boolean jj_3R_111() {
+    if (jj_3R_118()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_96() {
-    if (jj_3R_106()) return true;
+  static final private boolean jj_3R_60() {
+    if (jj_3R_69()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_107()) { jj_scanpos = xsp; break; }
+      if (jj_3_1()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_110() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_115()) {
-    jj_scanpos = xsp;
-    if (jj_3R_116()) return true;
+  static final private boolean jj_3R_115() {
+    if (jj_scan_token(BIT_OR)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_114()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_115() {
-    if (jj_scan_token(TRUE)) return true;
+  static final private boolean jj_3R_110() {
+    if (jj_scan_token(STRING_LITERAL)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_60() {
-    if (jj_scan_token(ASSIGN)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_69()) return true;
+  static final private boolean jj_3R_104() {
+    if (jj_3R_114()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_115()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
     return false;
   }
 
-  static final private boolean jj_3R_104() {
-    if (jj_3R_111()) return true;
+  static final private boolean jj_3R_109() {
+    if (jj_scan_token(FLOATING_POINT_LITERAL)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_52() {
-    if (jj_3R_59()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+  static final private boolean jj_3R_98() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_60()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_108()) {
+    jj_scanpos = xsp;
+    if (jj_3R_109()) {
+    jj_scanpos = xsp;
+    if (jj_3R_110()) {
+    jj_scanpos = xsp;
+    if (jj_3R_111()) {
+    jj_scanpos = xsp;
+    if (jj_3R_112()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_103() {
-    if (jj_3R_110()) return true;
+  static final private boolean jj_3R_108() {
+    if (jj_scan_token(INTEGER_LITERAL)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_97() {
-    if (jj_scan_token(DOT)) return true;
+  static final private boolean jj_3R_56() {
+    if (jj_3R_36()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_96()) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_61() {
+    if (jj_scan_token(ASSIGN)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_70()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_99() {
-    if (jj_scan_token(_ANDL)) return true;
+  static final private boolean jj_3R_105() {
+    if (jj_scan_token(DOT)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_104()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_102() {
-    if (jj_scan_token(STRING_LITERAL)) return true;
+  static final private boolean jj_3R_107() {
+    if (jj_scan_token(_ANDL)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_101() {
-    if (jj_scan_token(FLOATING_POINT_LITERAL)) return true;
+  static final private boolean jj_3R_53() {
+    if (jj_3R_60()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_61()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_89() {
-    if (jj_3R_96()) return true;
+  static final private boolean jj_3R_93() {
+    if (jj_3R_104()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_97()) { jj_scanpos = xsp; break; }
+      if (jj_3R_105()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_94() {
+  static final private boolean jj_3R_42() {
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_100()) {
-    jj_scanpos = xsp;
-    if (jj_3R_101()) {
-    jj_scanpos = xsp;
-    if (jj_3R_102()) {
-    jj_scanpos = xsp;
-    if (jj_3R_103()) {
+    if (jj_3R_56()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_scan_token(RBRACKET)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_41() {
+    if (jj_scan_token(CLASSACCESS)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_55()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_33() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_41()) {
     jj_scanpos = xsp;
-    if (jj_3R_104()) return true;
+    if (jj_3R_42()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_100() {
-    if (jj_scan_token(INTEGER_LITERAL)) return true;
+  static final private boolean jj_3R_188() {
+    if (jj_3R_33()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_55() {
-    if (jj_3R_35()) return true;
+  static final private boolean jj_3R_187() {
+    if (jj_3R_191()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_98() {
+  static final private boolean jj_3R_185() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_187()) {
+    jj_scanpos = xsp;
+    if (jj_3R_188()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_106() {
     if (jj_scan_token(SC_AND)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_92() {
+  static final private boolean jj_3R_96() {
     if (jj_scan_token(_ORL)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_90() {
+  static final private boolean jj_3R_94() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_98()) {
+    if (jj_3R_106()) {
     jj_scanpos = xsp;
-    if (jj_3R_99()) return true;
+    if (jj_3R_107()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_89()) return true;
+    if (jj_3R_93()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_70() {
-    if (jj_3R_89()) return true;
+  static final private boolean jj_3R_71() {
+    if (jj_3R_93()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_90()) { jj_scanpos = xsp; break; }
+      if (jj_3R_94()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_41() {
-    if (jj_scan_token(LBRACKET)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_55()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(RBRACKET)) return true;
+  static final private boolean jj_3R_190() {
+    if (jj_3R_60()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_40() {
-    if (jj_scan_token(CLASSACCESS)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_54()) return true;
+  static final private boolean jj_3R_189() {
+    if (jj_scan_token(IDENTIFIER)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_32() {
+  static final private boolean jj_3R_186() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_40()) {
+    if (jj_3R_189()) {
     jj_scanpos = xsp;
-    if (jj_3R_41()) return true;
+    if (jj_3R_190()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_66() {
+  static final private boolean jj_3R_67() {
     if (jj_scan_token(HOOK)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_35()) return true;
+    if (jj_3R_36()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     if (jj_scan_token(COLON)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_57()) return true;
+    if (jj_3R_58()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_176() {
-    if (jj_3R_32()) return true;
+  static final private boolean jj_3R_181() {
+    if (jj_3R_60()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_175() {
-    if (jj_3R_179()) return true;
+  static final private boolean jj_3R_95() {
+    if (jj_scan_token(SC_OR)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_173() {
+  static final private boolean jj_3R_72() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_175()) {
+    if (jj_3R_95()) {
     jj_scanpos = xsp;
-    if (jj_3R_176()) return true;
+    if (jj_3R_96()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_71()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_91() {
-    if (jj_scan_token(SC_OR)) return true;
+  static final private boolean jj_3R_180() {
+    if (jj_scan_token(NEW)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_186()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_71() {
+  static final private boolean jj_3R_183() {
+    if (jj_scan_token(DECR)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_179() {
+    if (jj_scan_token(IDENTIFIER)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_177() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_91()) {
+    if (jj_3R_179()) {
     jj_scanpos = xsp;
-    if (jj_3R_92()) return true;
+    if (jj_3R_180()) {
+    jj_scanpos = xsp;
+    if (jj_3R_181()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_70()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_65() {
-    if (jj_3R_70()) return true;
+  static final private boolean jj_3R_66() {
+    if (jj_3R_71()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_71()) { jj_scanpos = xsp; break; }
+      if (jj_3R_72()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_178() {
-    if (jj_3R_59()) return true;
+  static final private boolean jj_3R_103() {
+    if (jj_scan_token(ARRAY)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_113()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_177() {
-    if (jj_scan_token(IDENTIFIER)) return true;
+  static final private boolean jj_3R_58() {
+    if (jj_3R_66()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_67()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_182() {
+    if (jj_scan_token(INCR)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_174() {
+  static final private boolean jj_3R_178() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_177()) {
+    if (jj_3R_182()) {
     jj_scanpos = xsp;
-    if (jj_3R_178()) return true;
+    if (jj_3R_183()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_168() {
-    if (jj_3R_59()) return true;
+  static final private boolean jj_3R_176() {
+    if (jj_3R_103()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_57() {
-    if (jj_3R_65()) return true;
+  static final private boolean jj_3R_184() {
+    if (jj_3R_185()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_66()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_171() {
-    if (jj_scan_token(BIT_AND)) return true;
+  static final private boolean jj_3R_54() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_53()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_167() {
+  static final private boolean jj_3R_175() {
+    if (jj_3R_177()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_171()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(NEW)) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_184()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
+    return false;
+  }
+
+  static final private boolean jj_3R_192() {
+    if (jj_3R_185()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_174()) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_85() {
+    if (jj_scan_token(TILDEEQUAL)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_170() {
-    if (jj_scan_token(DECR)) return true;
+  static final private boolean jj_3R_84() {
+    if (jj_scan_token(DOTASSIGN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_164() {
+  static final private boolean jj_3R_172() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_166()) {
+    if (jj_3_4()) {
     jj_scanpos = xsp;
-    if (jj_3R_167()) {
+    if (jj_3R_175()) {
     jj_scanpos = xsp;
-    if (jj_3R_168()) return true;
+    if (jj_3R_176()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_166() {
+  static final private boolean jj_3_4() {
     if (jj_scan_token(IDENTIFIER)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_84() {
-    if (jj_scan_token(DOTASSIGN)) return true;
+    if (jj_scan_token(STATICCLASSACCESS)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_186()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_192()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
     return false;
   }
 
@@ -3722,128 +3874,79 @@ StringBuffer buff = new StringBuffer();
     return false;
   }
 
-  static final private boolean jj_3R_95() {
-    if (jj_scan_token(ARRAY)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_105()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
   static final private boolean jj_3R_80() {
-    if (jj_scan_token(RUNSIGNEDSHIFTASSIGN)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_53() {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_52()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_79() {
     if (jj_scan_token(RSIGNEDSHIFTASSIGN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_78() {
+  static final private boolean jj_3R_79() {
     if (jj_scan_token(LSHIFTASSIGN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_77() {
+  static final private boolean jj_3R_78() {
     if (jj_scan_token(MINUSASSIGN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_169() {
-    if (jj_scan_token(INCR)) return true;
+  static final private boolean jj_3R_77() {
+    if (jj_scan_token(PLUSASSIGN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_161() {
-    if (jj_3R_95()) return true;
+  static final private boolean jj_3R_40() {
+    if (jj_3R_53()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_165() {
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_169()) {
-    jj_scanpos = xsp;
-    if (jj_3R_170()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_172() {
-    if (jj_3R_173()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_54()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
     return false;
   }
 
   static final private boolean jj_3R_76() {
-    if (jj_scan_token(PLUSASSIGN)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_75() {
     if (jj_scan_token(REMASSIGN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_160() {
-    if (jj_3R_164()) return true;
+  static final private boolean jj_3R_174() {
+    if (jj_3R_172()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_172()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
+    xsp = jj_scanpos;
+    if (jj_3R_178()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_74() {
+  static final private boolean jj_3R_75() {
     if (jj_scan_token(SLASHASSIGN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_73() {
+  static final private boolean jj_3R_74() {
     if (jj_scan_token(STARASSIGN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_180() {
-    if (jj_3R_173()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_72() {
+  static final private boolean jj_3R_73() {
     if (jj_scan_token(ASSIGN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_67() {
+  static final private boolean jj_3R_68() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_72()) {
-    jj_scanpos = xsp;
     if (jj_3R_73()) {
     jj_scanpos = xsp;
     if (jj_3R_74()) {
@@ -3866,7 +3969,9 @@ StringBuffer buff = new StringBuffer();
     jj_scanpos = xsp;
     if (jj_3R_83()) {
     jj_scanpos = xsp;
-    if (jj_3R_84()) return true;
+    if (jj_3R_84()) {
+    jj_scanpos = xsp;
+    if (jj_3R_85()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -3883,274 +3988,339 @@ StringBuffer buff = new StringBuffer();
     return false;
   }
 
-  static final private boolean jj_3_4() {
-    if (jj_scan_token(IDENTIFIER)) return true;
+  static final private boolean jj_3R_173() {
+    if (jj_scan_token(LPAREN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(STATICCLASSACCESS)) return true;
+    if (jj_3R_35()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_174()) return true;
+    if (jj_scan_token(RPAREN)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_147()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_180()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
     return false;
   }
 
-  static final private boolean jj_3R_154() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3_4()) {
-    jj_scanpos = xsp;
-    if (jj_3R_160()) {
-    jj_scanpos = xsp;
-    if (jj_3R_161()) return true;
+  static final private boolean jj_3_3() {
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_35()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_scan_token(RPAREN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_39() {
-    if (jj_3R_52()) return true;
+  static final private boolean jj_3R_171() {
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_36()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_scan_token(RPAREN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_53()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
     return false;
   }
 
-  static final private boolean jj_3R_58() {
-    if (jj_3R_67()) return true;
+  static final private boolean jj_3R_170() {
+    if (jj_3R_98()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_35()) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_59() {
+    if (jj_3R_68()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_36()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_163() {
-    if (jj_3R_154()) return true;
+  static final private boolean jj_3R_169() {
+    if (jj_3R_174()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_165()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_51() {
-    if (jj_3R_57()) return true;
+  static final private boolean jj_3R_39() {
+    if (jj_scan_token(IDENTIFIER)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_scan_token(COLON)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_52() {
+    if (jj_3R_58()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_58()) jj_scanpos = xsp;
+    if (jj_3R_59()) jj_scanpos = xsp;
     else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_35() {
+  static final private boolean jj_3R_168() {
+    if (jj_3R_173()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_36() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_50()) {
+    if (jj_3R_51()) {
     jj_scanpos = xsp;
-    if (jj_3R_51()) return true;
+    if (jj_3R_52()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_50() {
-    if (jj_3R_56()) return true;
+  static final private boolean jj_3R_51() {
+    if (jj_3R_57()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_162() {
-    if (jj_scan_token(LPAREN)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_34()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(RPAREN)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_137()) return true;
+  static final private boolean jj_3R_166() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_167()) {
+    jj_scanpos = xsp;
+    if (jj_3R_168()) {
+    jj_scanpos = xsp;
+    if (jj_3R_169()) {
+    jj_scanpos = xsp;
+    if (jj_3R_170()) {
+    jj_scanpos = xsp;
+    if (jj_3R_171()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_49() {
-    if (jj_scan_token(INTEGER)) return true;
+  static final private boolean jj_3R_167() {
+    if (jj_scan_token(BANG)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_147()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_38() {
-    if (jj_scan_token(IDENTIFIER)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(COLON)) return true;
+  static final private boolean jj_3R_50() {
+    if (jj_scan_token(INTEGER)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3_3() {
-    if (jj_scan_token(LPAREN)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_34()) return true;
+  static final private boolean jj_3R_165() {
+    if (jj_scan_token(DECR)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(RPAREN)) return true;
+    if (jj_3R_172()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_48() {
+  static final private boolean jj_3R_49() {
     if (jj_scan_token(INT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_159() {
-    if (jj_scan_token(LPAREN)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_35()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(RPAREN)) return true;
+  static final private boolean jj_3R_48() {
+    if (jj_scan_token(FLOAT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
   static final private boolean jj_3R_47() {
-    if (jj_scan_token(FLOAT)) return true;
+    if (jj_scan_token(DOUBLE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_158() {
-    if (jj_3R_94()) return true;
+  static final private boolean jj_3R_164() {
+    if (jj_scan_token(INCR)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_172()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_46() {
-    if (jj_scan_token(DOUBLE)) return true;
+  static final private boolean jj_3R_163() {
+    if (jj_scan_token(MINUS)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_157() {
-    if (jj_3R_163()) return true;
+  static final private boolean jj_3R_46() {
+    if (jj_scan_token(REAL)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
   static final private boolean jj_3R_45() {
-    if (jj_scan_token(REAL)) return true;
+    if (jj_scan_token(BOOLEAN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_156() {
-    if (jj_3R_162()) return true;
+  static final private boolean jj_3R_44() {
+    if (jj_scan_token(BOOL)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_44() {
-    if (jj_scan_token(BOOLEAN)) return true;
+  static final private boolean jj_3R_161() {
+    if (jj_3R_166()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_153() {
+  static final private boolean jj_3R_35() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_155()) {
+    if (jj_3R_43()) {
     jj_scanpos = xsp;
-    if (jj_3R_156()) {
+    if (jj_3R_44()) {
     jj_scanpos = xsp;
-    if (jj_3R_157()) {
+    if (jj_3R_45()) {
     jj_scanpos = xsp;
-    if (jj_3R_158()) {
+    if (jj_3R_46()) {
     jj_scanpos = xsp;
-    if (jj_3R_159()) return true;
+    if (jj_3R_47()) {
+    jj_scanpos = xsp;
+    if (jj_3R_48()) {
+    jj_scanpos = xsp;
+    if (jj_3R_49()) {
+    jj_scanpos = xsp;
+    if (jj_3R_50()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_43() {
+    if (jj_scan_token(STRING)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_160() {
+    if (jj_3R_165()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
   static final private boolean jj_3R_155() {
-    if (jj_scan_token(BANG)) return true;
+    if (jj_scan_token(REM)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_137()) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_159() {
+    if (jj_3R_164()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_43() {
-    if (jj_scan_token(BOOL)) return true;
+  static final private boolean jj_3R_162() {
+    if (jj_scan_token(PLUS)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_34() {
+  static final private boolean jj_3R_156() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_42()) {
-    jj_scanpos = xsp;
-    if (jj_3R_43()) {
-    jj_scanpos = xsp;
-    if (jj_3R_44()) {
-    jj_scanpos = xsp;
-    if (jj_3R_45()) {
-    jj_scanpos = xsp;
-    if (jj_3R_46()) {
+    if (jj_3R_158()) {
     jj_scanpos = xsp;
-    if (jj_3R_47()) {
+    if (jj_3R_159()) {
     jj_scanpos = xsp;
-    if (jj_3R_48()) {
+    if (jj_3R_160()) {
     jj_scanpos = xsp;
-    if (jj_3R_49()) return true;
+    if (jj_3R_161()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_158() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_162()) {
+    jj_scanpos = xsp;
+    if (jj_3R_163()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_147()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_42() {
-    if (jj_scan_token(STRING)) return true;
+  static final private boolean jj_3R_57() {
+    if (jj_scan_token(PRINT)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_36()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_157() {
+    if (jj_scan_token(AT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
   static final private boolean jj_3R_152() {
-    if (jj_scan_token(DECR)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_157()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
+    if (jj_3R_156()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_154()) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_154() {
+    if (jj_scan_token(SLASH)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_148() {
-    if (jj_scan_token(REM)) return true;
+  static final private boolean jj_3R_147() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_151()) {
+    jj_scanpos = xsp;
+    if (jj_3R_152()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
   static final private boolean jj_3R_151() {
-    if (jj_scan_token(INCR)) return true;
+    if (jj_scan_token(BIT_AND)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_156()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_154()) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_146() {
+    if (jj_scan_token(RUNSIGNEDSHIFT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
@@ -4161,34 +4331,48 @@ StringBuffer buff = new StringBuffer();
     return false;
   }
 
-  static final private boolean jj_3R_145() {
-    if (jj_3R_153()) return true;
+  static final private boolean jj_3R_153() {
+    if (jj_scan_token(STAR)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_144() {
-    if (jj_3R_152()) return true;
+  static final private boolean jj_3R_148() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_153()) {
+    jj_scanpos = xsp;
+    if (jj_3R_154()) {
+    jj_scanpos = xsp;
+    if (jj_3R_155()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_147()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_143() {
-    if (jj_3R_151()) return true;
+  static final private boolean jj_3R_141() {
+    if (jj_scan_token(GE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_147() {
-    if (jj_scan_token(SLASH)) return true;
+  static final private boolean jj_3R_142() {
+    if (jj_3R_147()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_148()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
     return false;
   }
 
-  static final private boolean jj_3R_56() {
-    if (jj_scan_token(PRINT)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_35()) return true;
+  static final private boolean jj_3R_145() {
+    if (jj_scan_token(RSIGNEDSHIFT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
@@ -4199,7 +4383,7 @@ StringBuffer buff = new StringBuffer();
     return false;
   }
 
-  static final private boolean jj_3R_142() {
+  static final private boolean jj_3R_143() {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_149()) {
@@ -4207,86 +4391,84 @@ StringBuffer buff = new StringBuffer();
     if (jj_3R_150()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_137()) return true;
+    if (jj_3R_142()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_137() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_141()) {
-    jj_scanpos = xsp;
-    if (jj_3R_142()) {
-    jj_scanpos = xsp;
-    if (jj_3R_143()) {
-    jj_scanpos = xsp;
-    if (jj_3R_144()) {
-    jj_scanpos = xsp;
-    if (jj_3R_145()) return true;
+  static final private boolean jj_3R_140() {
+    if (jj_scan_token(LE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_141() {
-    if (jj_scan_token(AT)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_137()) return true;
+  static final private boolean jj_3R_136() {
+    if (jj_3R_142()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_143()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
     return false;
   }
 
-  static final private boolean jj_3R_136() {
-    if (jj_scan_token(RUNSIGNEDSHIFT)) return true;
+  static final private boolean jj_3_2() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_34()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_140() {
-    if (jj_scan_token(MINUS)) return true;
+  static final private boolean jj_3R_144() {
+    if (jj_scan_token(LSHIFT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_146() {
-    if (jj_scan_token(STAR)) return true;
+  static final private boolean jj_3R_120() {
+    if (jj_3R_34()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_2()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
     return false;
   }
 
-  static final private boolean jj_3R_138() {
+  static final private boolean jj_3R_137() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_146()) {
+    if (jj_3R_144()) {
     jj_scanpos = xsp;
-    if (jj_3R_147()) {
+    if (jj_3R_145()) {
     jj_scanpos = xsp;
-    if (jj_3R_148()) return true;
+    if (jj_3R_146()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_137()) return true;
+    if (jj_3R_136()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_131() {
-    if (jj_scan_token(GE)) return true;
+  static final private boolean jj_3R_139() {
+    if (jj_scan_token(GT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_132() {
-    if (jj_3R_137()) return true;
+  static final private boolean jj_3R_130() {
+    if (jj_3R_136()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_138()) { jj_scanpos = xsp; break; }
+      if (jj_3R_137()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
@@ -4302,28 +4484,33 @@ StringBuffer buff = new StringBuffer();
   static public boolean lookingAhead = false;
   static private boolean jj_semLA;
   static private int jj_gen;
-  static final private int[] jj_la1 = new int[98];
+  static final private int[] jj_la1 = new int[101];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static private int[] jj_la1_2;
   static private int[] jj_la1_3;
+  static private int[] jj_la1_4;
   static {
       jj_la1_0();
       jj_la1_1();
       jj_la1_2();
       jj_la1_3();
+      jj_la1_4();
    }
    private static void jj_la1_0() {
-      jj_la1_0 = new int[] {0x2,0x7fcb0000,0x0,0x60000,0x60000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0xc00000,0x0,0x0,0x0,0x0,0x0,0x0,0xc00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0x400000,0x0,0x0,0x80000000,0x80000000,0x400000,0x0,0x0,0x0,0x80000000,0xc00000,0x80000000,0x0,0x0,0xc00000,0x0,0x0,0x0,0x7f480000,0x0,0x0,0x0,0x0,0x1e000000,0x0,0x0,0x0,0x0,0x0,0x0,0x7fcb0000,0x7fcb0000,0x0,0x0,0x0,0x400000,0x0,0x7fcb0000,0x0,0x100000,0x200000,0x7fc80000,0x0,0x7fc80000,0x0,0x400000,0xc00000,0x400000,0x400000,0x0,0x0,0x0,0xc00000,};
+      jj_la1_0 = new int[] {0x2,0x7fcb0000,0x0,0x60000,0x60000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0xc00000,0x0,0x0,0x0,0x0,0x0,0x0,0xc00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0x400000,0x0,0x400000,0x0,0x0,0x80000000,0x80000000,0x400000,0x0,0x0,0x80000000,0xc00000,0x80000000,0x0,0x0,0xc00000,0x0,0x0,0x0,0x7f480000,0x0,0x0,0x0,0x0,0x1e000000,0x0,0x0,0x0,0x0,0x0,0x0,0x7fcb0000,0x7fcb0000,0x0,0x0,0x0,0x400000,0x0,0x7fcb0000,0x0,0x100000,0x200000,0x7fc80000,0x0,0x7fc80000,0x0,0x400000,0xc00000,0x400000,0x400000,0x0,0x0,0x0,0xc00000,};
    }
    private static void jj_la1_1() {
-      jj_la1_1 = new int[] {0x0,0xd76a4,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x42200,0x2,0x43200,0x0,0x0,0x0,0x0,0x3fa00000,0x0,0x43200,0x0,0x0,0x40000000,0x40000000,0x80000000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x43200,0x0,0x43200,0x0,0x0,0x0,0x0,0x1000,0x0,0x1000,0x0,0x0,0x43200,0x0,0x42200,0x40200,0x43200,0x0,0x0,0x0,0x954a4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xd76a4,0xd76a4,0x0,0x0,0x0,0x1000,0x48,0xd76a4,0x48,0x0,0x0,0xd76a4,0x0,0xd76a4,0x0,0x1000,0x43200,0x1000,0x1000,0x0,0x0,0x0,0x43200,};
+      jj_la1_1 = new int[] {0x0,0xd76a4,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x42200,0x2,0x43200,0x0,0x0,0x0,0x0,0x3fa00000,0x0,0x43200,0x0,0x0,0x40000000,0x40000000,0x80000000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x43200,0x0,0x43200,0x0,0x43200,0x0,0x0,0x0,0x0,0x1000,0x1000,0x0,0x0,0x43200,0x0,0x42200,0x40200,0x43200,0x0,0x0,0x0,0x954a4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xd76a4,0xd76a4,0x0,0x0,0x0,0x1000,0x48,0xd76a4,0x48,0x0,0x0,0xd76a4,0x0,0xd76a4,0x0,0x1000,0x43200,0x1000,0x1000,0x0,0x0,0x0,0x43200,};
    }
    private static void jj_la1_2() {
-      jj_la1_2 = new int[] {0x0,0x11914451,0x0,0x0,0x0,0x200000,0x2000000,0x10000,0x1000000,0x10000,0x1010400,0x1010400,0x51,0x0,0x11804451,0x0,0x200000,0x1000000,0x0,0x0,0x2000000,0x11804451,0x2000000,0x20000000,0x0,0x0,0x0,0x0,0x400000,0x0,0x0,0x0,0x80000000,0x80000000,0xc000000,0xc000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x11804451,0x10000000,0x1004451,0x0,0x0,0x44000,0x44000,0x1000400,0x0,0x1000400,0x1000400,0x44000,0x11804451,0x40000,0x51,0x0,0x11804451,0x200000,0x100000,0x800000,0x1910400,0x100000,0x100000,0x100000,0x100000,0x0,0x200000,0x100000,0x200000,0x100000,0x200000,0x100000,0x11914451,0x11914451,0x200000,0x2000000,0x2000000,0x1000400,0x0,0x11914451,0x0,0x0,0x0,0x11914451,0x100000,0x51914451,0x100000,0x1000400,0x11804451,0x1000400,0x1000400,0x200000,0x400,0x400,0x11804451,};
+      jj_la1_2 = new int[] {0x0,0x11914451,0x0,0x0,0x0,0x200000,0x2000000,0x10000,0x1000000,0x10000,0x1010400,0x1010400,0x11,0x11,0x451,0x0,0x11804451,0x0,0x200000,0x1000000,0x0,0x0,0x2000000,0x11804451,0x2000000,0x20000000,0x0,0x0,0x0,0x0,0x400000,0x0,0x0,0x0,0x80000000,0x80000000,0xc000000,0xc000000,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x11804451,0x0,0x11004451,0x10000000,0x1004451,0x0,0x0,0x44000,0x44000,0x1000400,0x1000400,0x1000400,0x44000,0x11804451,0x40000,0x51,0x0,0x11804451,0x200000,0x100000,0x800000,0x1910400,0x100000,0x100000,0x100000,0x100000,0x0,0x200000,0x100000,0x200000,0x100000,0x200000,0x100000,0x11914451,0x11914451,0x200000,0x2000000,0x2000000,0x1000400,0x0,0x11914451,0x0,0x0,0x0,0x11914451,0x100000,0x51914451,0x100000,0x1000400,0x11804451,0x1000400,0x1000400,0x200000,0x400,0x400,0x11804451,};
    }
    private static void jj_la1_3() {
-      jj_la1_3 = new int[] {0x0,0x400009e0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000000,0x0,0x40000000,0x40000000,0x0,0x0,0x400009e0,0x800,0x0,0x40000800,0x800,0x0,0x3ffc0000,0x400009e0,0x3ffc0000,0x0,0x8,0x8,0x10,0x10,0x0,0x1000,0x2000,0x800,0x4,0x4,0x3,0x3,0x38000,0x38000,0x180,0x180,0x4600,0x4600,0x180,0x400009e0,0x0,0x40000800,0x60,0x60,0x0,0x0,0x40000800,0x800,0x40000800,0x40000000,0x0,0x400009e0,0x0,0x0,0x0,0x400009e0,0x0,0x80000000,0x0,0x40000860,0x80000000,0x80000000,0x80000000,0x80000000,0x0,0x0,0x80000000,0x0,0x80000000,0x0,0x80000000,0x400009e0,0x400009e0,0x0,0x3ffc0060,0x3ffc0060,0x40000860,0x0,0x400009e0,0x0,0x0,0x0,0x400009e0,0x80000000,0x400009e0,0x80000000,0x40000860,0x400009e0,0x40000860,0x40000860,0x0,0x0,0x0,0x400009e0,};
+      jj_la1_3 = new int[] {0x0,0x9e0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x0,0x9e0,0x800,0x0,0x800,0x800,0x0,0x9ffc0000,0x9e0,0x9ffc0000,0x0,0x8,0x8,0x10,0x10,0x0,0x1000,0x2000,0x800,0x60000004,0x60000004,0x3,0x3,0x38000,0x38000,0x180,0x180,0x4600,0x4600,0x0,0x9e0,0x180,0x1e0,0x0,0x0,0x60,0x60,0x0,0x0,0x0,0x0,0x0,0x0,0x9e0,0x0,0x0,0x0,0x9e0,0x0,0x0,0x0,0x60,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x9e0,0x9e0,0x0,0x9ffc0060,0x9ffc0060,0x60,0x0,0x9e0,0x0,0x0,0x0,0x9e0,0x0,0x9e0,0x0,0x60,0x9e0,0x60,0x60,0x0,0x0,0x0,0x9e0,};
+   }
+   private static void jj_la1_4() {
+      jj_la1_4 = new int[] {0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0x1,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0x0,0x1,0x0,0x0,0x0,0x0,0x1,0x1,0x1,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x2,0x0,0x1,0x2,0x2,0x2,0x2,0x0,0x0,0x2,0x0,0x2,0x0,0x2,0x1,0x1,0x0,0x0,0x0,0x1,0x0,0x1,0x0,0x0,0x0,0x1,0x2,0x1,0x2,0x1,0x1,0x1,0x1,0x0,0x0,0x0,0x1,};
    }
   static final private JJCalls[] jj_2_rtns = new JJCalls[7];
   static private boolean jj_rescan = false;
@@ -4342,7 +4529,7 @@ StringBuffer buff = new StringBuffer();
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 98; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 101; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4352,7 +4539,7 @@ StringBuffer buff = new StringBuffer();
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 98; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 101; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4369,7 +4556,7 @@ StringBuffer buff = new StringBuffer();
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 98; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 101; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4379,7 +4566,7 @@ StringBuffer buff = new StringBuffer();
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 98; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 101; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4395,7 +4582,7 @@ StringBuffer buff = new StringBuffer();
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 98; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 101; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4404,7 +4591,7 @@ StringBuffer buff = new StringBuffer();
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 98; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 101; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4511,15 +4698,15 @@ StringBuffer buff = new StringBuffer();
 
   static public ParseException generateParseException() {
     jj_expentries.removeAllElements();
-    boolean[] la1tokens = new boolean[128];
-    for (int i = 0; i < 128; i++) {
+    boolean[] la1tokens = new boolean[130];
+    for (int i = 0; i < 130; i++) {
       la1tokens[i] = false;
     }
     if (jj_kind >= 0) {
       la1tokens[jj_kind] = true;
       jj_kind = -1;
     }
-    for (int i = 0; i < 98; i++) {
+    for (int i = 0; i < 101; i++) {
       if (jj_la1[i] == jj_gen) {
         for (int j = 0; j < 32; j++) {
           if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -4534,10 +4721,13 @@ StringBuffer buff = new StringBuffer();
           if ((jj_la1_3[i] & (1<<j)) != 0) {
             la1tokens[96+j] = true;
           }
+          if ((jj_la1_4[i] & (1<<j)) != 0) {
+            la1tokens[128+j] = true;
+          }
         }
       }
     }
-    for (int i = 0; i < 128; i++) {
+    for (int i = 0; i < 130; i++) {
       if (la1tokens[i]) {
         jj_expentry = new int[1];
         jj_expentry[0] = i;
diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.jj b/net.sourceforge.phpeclipse/src/test/PHPParser.jj
index 861d2c6..9e3fc1d 100644
--- a/net.sourceforge.phpeclipse/src/test/PHPParser.jj
+++ b/net.sourceforge.phpeclipse/src/test/PHPParser.jj
@@ -127,7 +127,12 @@ public class PHPParser extends PHPParserSuperclass {
    */
   private static void setMarker(ParseException e) {
     try {
-      setMarker(fileToParse, errorMessage, jj_input_stream.tokenBegin,jj_input_stream.tokenBegin+e.currentToken.image.length(), errorLevel);
+      setMarker(fileToParse,
+                errorMessage,
+                jj_input_stream.tokenBegin,
+                jj_input_stream.tokenBegin + e.currentToken.image.length(),
+                errorLevel,
+                "Line " + e.currentToken.beginLine);
     } catch (CoreException e2) {
       PHPeclipsePlugin.log(e2);
     }
@@ -441,7 +446,7 @@ MORE :
   >
 |
   < #SPECIAL:
-    "_"
+    "_" | ["\u007f"-"\u00ff"]
   >
 }
 
@@ -502,7 +507,9 @@ MORE :
 | <REMASSIGN: "%=" >
 | <LSHIFTASSIGN: "<<=" >
 | <RSIGNEDSHIFTASSIGN: ">>=" >
-| <RUNSIGNEDSHIFTASSIGN: ">>>=" >
+| <BANGDOUBLEEQUAL: "!==" >
+| <TRIPLEEQUAL: "===" >
+| <TILDEEQUAL: "~=" >
 }
 
 <PHPPARSING> TOKEN :
@@ -528,8 +535,14 @@ void phpTest() :
 void phpFile() :
 {}
 {
+  try {
   (<PHPSTART> Php() <PHPEND>)*
   <EOF>
+  } catch (TokenMgrError e) {
+    errorMessage = e.getMessage();
+    errorLevel   = ERROR;
+    throw generateParseException();
+  }
 }
 
 void Php() :
@@ -701,13 +714,23 @@ Token token;
 String VariableInitializer() :
 {
   String expr;
+  Token token;
 }
 {
   expr = Literal()
   {return expr;}
 |
+  <MINUS> (token = <INTEGER_LITERAL> | token = <FLOATING_POINT_LITERAL>)
+  {return "-" + token.image;}
+|
+  <PLUS> (token = <INTEGER_LITERAL> | token = <FLOATING_POINT_LITERAL>)
+  {return "+" + token.image;}
+|
   expr = ArrayDeclarator()
   {return expr;}
+|
+  token = <IDENTIFIER>
+  {return token.image;}
 }
 
 String ArrayVariable() :
@@ -867,7 +890,7 @@ String Expression() :
     } catch (ParseException e) {
       errorMessage = "expression expected";
       errorLevel   = ERROR;
-      throw generateParseException();
+      throw e;
     }
   ]
   {
@@ -898,8 +921,6 @@ String AssignmentOperator() :
 {return "<<=";}
 | <RSIGNEDSHIFTASSIGN>
 {return ">>=";}
-| <RUNSIGNEDSHIFTASSIGN>
-{return ">>>=";}
 | <ANDASSIGN>
 {return "&=";}
 | <XORASSIGN>
@@ -908,6 +929,8 @@ String AssignmentOperator() :
 {return "|=";}
 | <DOTASSIGN>
 {return ".=";}
+| <TILDEEQUAL>
+{return "~=";}
 }
 
 String ConditionalExpression() :
@@ -1078,7 +1101,12 @@ String EqualityExpression() :
   expr = RelationalExpression()
   {buff.append(expr);}
   (
-  ( operator = <EQ> | operator = <NE> ) expr2 = RelationalExpression()
+  (   operator = <EQ>
+    | operator = <NE>
+    | operator = <BANGDOUBLEEQUAL>
+    | operator = <TRIPLEEQUAL>
+  )
+  expr2 = RelationalExpression()
   {
     buff.append(operator.image);
     buff.append(expr2);
@@ -1165,15 +1193,34 @@ String MultiplicativeExpression() :
   {return buff.toString();}
 }
 
+/**
+ * An unary expression starting with @, & or nothing
+ */
 String UnaryExpression() :
 {
   String expr;
   Token token;
+  final StringBuffer buff = new StringBuffer();
 }
 {
-  <AT> expr = UnaryExpression()
-  {return "@" + expr;}
+  token = <BIT_AND> expr = UnaryExpressionNoPrefix()
+  {
+    if (token == null) {
+      return expr;
+    }
+    return token.image + expr;
+  }
 |
+  (<AT> {buff.append("@");})* expr = UnaryExpressionNoPrefix()
+  {return buff.append(expr).toString();}
+}
+
+String UnaryExpressionNoPrefix() :
+{
+  String expr;
+  Token token;
+}
+{
   ( token = <PLUS> | token = <MINUS> ) expr = UnaryExpression()
   {
     return token.image + expr;
@@ -1189,6 +1236,7 @@ String UnaryExpression() :
   {return expr;}
 }
 
+
 String PreIncrementExpression() :
 {
 String expr;
@@ -1296,12 +1344,9 @@ String PrimaryPrefix() :
   token = <IDENTIFIER>
   {return token.image;}
 |
-  [token = <BIT_AND>] <NEW> expr = ClassIdentifier()
+  <NEW> expr = ClassIdentifier()
   {
-    if (token == null) {
-      return "new " + expr;
-    }
-    return "new &" + expr;
+    return "new " + expr;
   }
 |  
   expr = VariableDeclaratorId()
@@ -1347,7 +1392,7 @@ String VariableSuffix() :
   } catch (ParseException e) {
     errorMessage = "']' expected";
     errorLevel   = ERROR;
-    throw generateParseException();
+    throw e;
   }
   {
     if(expr == null) {
@@ -1369,14 +1414,8 @@ String Literal() :
   token = <FLOATING_POINT_LITERAL>
   {return token.image;}
 |
-  try {
-    token = <STRING_LITERAL>
+  token = <STRING_LITERAL>
   {return token.image;}
-  } catch (TokenMgrError e) {
-    errorMessage = "unterminated string";
-    errorLevel   = ERROR;
-    throw generateParseException();
-  }
 |
   expr = BooleanLiteral()
   {return expr;}
diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java b/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java
index d427051..ab69d54 100644
--- a/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java
+++ b/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java
@@ -118,8 +118,10 @@ public interface PHPParserConstants {
   int REMASSIGN = 122;
   int LSHIFTASSIGN = 123;
   int RSIGNEDSHIFTASSIGN = 124;
-  int RUNSIGNEDSHIFTASSIGN = 125;
-  int DOLLAR_ID = 126;
+  int BANGDOUBLEEQUAL = 125;
+  int TRIPLEEQUAL = 126;
+  int TILDEEQUAL = 127;
+  int DOLLAR_ID = 128;
 
   int DEFAULT = 0;
   int PHPPARSING = 1;
@@ -205,7 +207,7 @@ public interface PHPParserConstants {
     "<IDENTIFIER>",
     "<LETTER>",
     "<DIGIT>",
-    "\"_\"",
+    "<SPECIAL>",
     "\"(\"",
     "\")\"",
     "\"{\"",
@@ -253,7 +255,9 @@ public interface PHPParserConstants {
     "\"%=\"",
     "\"<<=\"",
     "\">>=\"",
-    "\">>>=\"",
+    "\"!==\"",
+    "\"===\"",
+    "\"~=\"",
     "<DOLLAR_ID>",
     "\"?>\"",
   };
diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserSuperclass.java b/net.sourceforge.phpeclipse/src/test/PHPParserSuperclass.java
index bdf9f88..687cbf4 100644
--- a/net.sourceforge.phpeclipse/src/test/PHPParserSuperclass.java
+++ b/net.sourceforge.phpeclipse/src/test/PHPParserSuperclass.java
@@ -153,4 +153,33 @@ public abstract class PHPParserSuperclass {
       MarkerUtilities.createMarker(file, attributes, IMarker.PROBLEM);
     }
   }
+
+    public static void setMarker(IFile file,
+                                String message,
+                                int charStart,
+                                int charEnd,
+                                int errorLevel,
+                                String location)
+    throws CoreException {
+    if (file != null) {
+      Hashtable attributes = new Hashtable();
+      MarkerUtilities.setMessage(attributes, message);
+      switch (errorLevel) {
+        case Parser.ERROR :
+          attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_ERROR));
+          break;
+        case Parser.WARNING :
+          attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_WARNING));
+          break;
+        case Parser.INFO :
+          attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_INFO));
+          break;
+      }
+      attributes.put(IMarker.LOCATION,location);
+      MarkerUtilities.setCharStart(attributes, charStart);
+      MarkerUtilities.setCharEnd(attributes, charEnd);
+      // setLineNumber(attributes, lineNumber);
+      MarkerUtilities.createMarker(file, attributes, IMarker.PROBLEM);
+    }
+  }
 }
diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserTestCase2.java b/net.sourceforge.phpeclipse/src/test/PHPParserTestCase2.java
index 6d0457d..d921054 100644
--- a/net.sourceforge.phpeclipse/src/test/PHPParserTestCase2.java
+++ b/net.sourceforge.phpeclipse/src/test/PHPParserTestCase2.java
@@ -29,6 +29,23 @@ public class PHPParserTestCase2 extends TestCase {
    *  Test the PHP Parser with different PHP snippets
    */
   public void testPHPParser() {
+    checkHTML("<?php  $a = &$b; ?>");
+    checkHTML("<?php ec ho 'coucou'; ?>" +
+              "\n dfgdfgfdfg" +
+              "\n" +
+              "\n" +
+              "<?php" +
+              "\necho ' caca';" +
+              "\n?>" +
+              "dfgdfg" +
+              "\ndsfgdf");
+    checkHTML("<?php echo 'coucou'; ?>" +
+              "\n dfgdfgfdfg" +
+              "\n" +
+              "\n" +
+              "<?php" +
+              "\necho ' caca';" +
+              "\n?>");
     checkHTML("<?php" +
               "\n//if (!isset($AtreidesLanguage)) $AtreidesLanguage='french';" +
               "\n$AtreidesLanguage='french';" +
diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java
index e8a8a8e..464bc79 100644
--- a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java
+++ b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java
@@ -52,28 +52,28 @@ static private final int jjMoveStringLiteralDfa0_0()
    switch(curChar)
    {
       case 63:
-         return jjMoveStringLiteralDfa1_0(0x8000000000000000L);
+         return jjMoveStringLiteralDfa1_0(0x2L);
       default :
          return jjMoveNfa_0(0, 0);
    }
 }
-static private final int jjMoveStringLiteralDfa1_0(long active1)
+static private final int jjMoveStringLiteralDfa1_0(long active2)
 {
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_0(0, 0L, active1, 0L);
+      jjStopStringLiteralDfa_0(0, 0L, 0L, active2);
       return 1;
    }
    switch(curChar)
    {
       case 62:
-         if ((active1 & 0x8000000000000000L) != 0L)
-            return jjStopAtPos(1, 127);
+         if ((active2 & 0x2L) != 0L)
+            return jjStopAtPos(1, 129);
          break;
       default :
          break;
    }
-   return jjStartNfa_0(0, 0L, active1, 0L);
+   return jjStartNfa_0(0, 0L, 0L, active2);
 }
 static private final void jjCheckNAdd(int state)
 {
@@ -305,7 +305,7 @@ static private final int jjMoveNfa_2(int startState, int curPos)
       catch(java.io.IOException e) { return curPos; }
    }
 }
-private static final int jjStopStringLiteralDfa_1(int pos, long active0, long active1)
+private static final int jjStopStringLiteralDfa_1(int pos, long active0, long active1, long active2)
 {
    switch (pos)
    {
@@ -434,9 +434,9 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac
          return -1;
    }
 }
-private static final int jjStartNfa_1(int pos, long active0, long active1)
+private static final int jjStartNfa_1(int pos, long active0, long active1, long active2)
 {
-   return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0, active1), pos + 1);
+   return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0, active1, active2), pos + 1);
 }
 static private final int jjStartNfaWithStates_1(int pos, int kind, int state)
 {
@@ -452,7 +452,7 @@ static private final int jjMoveStringLiteralDfa0_1()
    {
       case 33:
          jjmatchedKind = 92;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x400000000L);
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x2000000400000000L);
       case 36:
          return jjStartNfaWithStates_1(0, 88, 16);
       case 37:
@@ -492,10 +492,10 @@ static private final int jjMoveStringLiteralDfa0_1()
          return jjMoveStringLiteralDfa1_1(0x0L, 0x800800100000000L);
       case 61:
          jjmatchedKind = 89;
-         return jjMoveStringLiteralDfa1_1(0x200000000L, 0x80000000L);
+         return jjMoveStringLiteralDfa1_1(0x200000000L, 0x4000000080000000L);
       case 62:
          jjmatchedKind = 90;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x3003000200000000L);
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x1003000200000000L);
       case 63:
          jjmatchedKind = 93;
          return jjMoveStringLiteralDfa1_1(0x4L, 0x0L);
@@ -563,6 +563,8 @@ static private final int jjMoveStringLiteralDfa0_1()
          return jjMoveStringLiteralDfa1_1(0x0L, 0x80000800000000L);
       case 125:
          return jjStopAtPos(0, 81);
+      case 126:
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x8000000000000000L);
       default :
          return jjMoveNfa_1(3, 0);
    }
@@ -571,7 +573,7 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1)
 {
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(0, active0, active1);
+      jjStopStringLiteralDfa_1(0, active0, active1, 0L);
       return 1;
    }
    switch(curChar)
@@ -609,13 +611,19 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1)
          return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x800000000000000L);
       case 61:
          if ((active1 & 0x80000000L) != 0L)
-            return jjStopAtPos(1, 95);
+         {
+            jjmatchedKind = 95;
+            jjmatchedPos = 1;
+         }
          else if ((active1 & 0x100000000L) != 0L)
             return jjStopAtPos(1, 96);
          else if ((active1 & 0x200000000L) != 0L)
             return jjStopAtPos(1, 97);
          else if ((active1 & 0x400000000L) != 0L)
-            return jjStopAtPos(1, 98);
+         {
+            jjmatchedKind = 98;
+            jjmatchedPos = 1;
+         }
          else if ((active1 & 0x4000000000000L) != 0L)
             return jjStopAtPos(1, 114);
          else if ((active1 & 0x8000000000000L) != 0L)
@@ -634,7 +642,9 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1)
             return jjStopAtPos(1, 121);
          else if ((active1 & 0x400000000000000L) != 0L)
             return jjStopAtPos(1, 122);
-         break;
+         else if ((active1 & 0x8000000000000000L) != 0L)
+            return jjStopAtPos(1, 127);
+         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x6000000000000000L);
       case 62:
          if ((active0 & 0x4L) != 0L)
             return jjStopAtPos(1, 2);
@@ -647,7 +657,7 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1)
             jjmatchedKind = 112;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x3002000000000000L);
+         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x1002000000000000L);
       case 65:
       case 97:
          return jjMoveStringLiteralDfa2_1(active0, 0x20800040000L, active1, 0L);
@@ -706,15 +716,15 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1)
       default :
          break;
    }
-   return jjStartNfa_1(0, active0, active1);
+   return jjStartNfa_1(0, active0, active1, 0L);
 }
 static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long old1, long active1)
 {
    if (((active0 &= old0) | (active1 &= old1)) == 0L)
-      return jjStartNfa_1(0, old0, old1); 
+      return jjStartNfa_1(0, old0, old1, 0L);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(1, active0, active1);
+      jjStopStringLiteralDfa_1(1, active0, active1, 0L);
       return 2;
    }
    switch(curChar)
@@ -724,14 +734,15 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long
             return jjStopAtPos(2, 123);
          else if ((active1 & 0x1000000000000000L) != 0L)
             return jjStopAtPos(2, 124);
+         else if ((active1 & 0x2000000000000000L) != 0L)
+            return jjStopAtPos(2, 125);
+         else if ((active1 & 0x4000000000000000L) != 0L)
+            return jjStopAtPos(2, 126);
          break;
       case 62:
          if ((active1 & 0x2000000000000L) != 0L)
-         {
-            jjmatchedKind = 113;
-            jjmatchedPos = 2;
-         }
-         return jjMoveStringLiteralDfa3_1(active0, 0L, active1, 0x2000000000000000L);
+            return jjStopAtPos(2, 113);
+         break;
       case 65:
       case 97:
          return jjMoveStringLiteralDfa3_1(active0, 0x200000040010000L, active1, 0L);
@@ -802,32 +813,28 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long
       default :
          break;
    }
-   return jjStartNfa_1(1, active0, active1);
+   return jjStartNfa_1(1, active0, active1, 0L);
 }
 static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long old1, long active1)
 {
    if (((active0 &= old0) | (active1 &= old1)) == 0L)
-      return jjStartNfa_1(1, old0, old1); 
+      return jjStartNfa_1(1, old0, old1, 0L);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(2, active0, active1);
+      jjStopStringLiteralDfa_1(2, active0, 0L, 0L);
       return 3;
    }
    switch(curChar)
    {
-      case 61:
-         if ((active1 & 0x2000000000000000L) != 0L)
-            return jjStopAtPos(3, 125);
-         break;
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa4_1(active0, 0x800004400400000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x800004400400000L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa4_1(active0, 0x400000020000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x400000020000000L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa4_1(active0, 0x20000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x20000L);
       case 69:
       case 101:
          if ((active0 & 0x200000L) != 0L)
@@ -839,10 +846,10 @@ static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long
             return jjStartNfaWithStates_1(3, 35, 14);
          else if ((active0 & 0x4000000000000L) != 0L)
             return jjStartNfaWithStates_1(3, 50, 14);
-         return jjMoveStringLiteralDfa4_1(active0, 0x2040810000100000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x2040810000100000L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa4_1(active0, 0x20000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x20000000000000L);
       case 76:
       case 108:
          if ((active0 & 0x200000000000L) != 0L)
@@ -854,10 +861,10 @@ static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long
          }
          else if ((active0 & 0x200000000000000L) != 0L)
             return jjStartNfaWithStates_1(3, 57, 14);
-         return jjMoveStringLiteralDfa4_1(active0, 0x10800000a000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x10800000a000000L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa4_1(active0, 0x800000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x800000L);
       case 79:
       case 111:
          if ((active0 & 0x1000000L) != 0L)
@@ -869,28 +876,28 @@ static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long
       case 115:
          if ((active0 & 0x2000000000000L) != 0L)
             return jjStartNfaWithStates_1(3, 49, 14);
-         return jjMoveStringLiteralDfa4_1(active0, 0x21000010000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x21000010000L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa4_1(active0, 0x1002040000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x1002040000000L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa4_1(active0, 0x400014000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x400014000000L);
       case 87:
       case 119:
-         return jjMoveStringLiteralDfa4_1(active0, 0x10000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x10000000000000L);
       default :
          break;
    }
-   return jjStartNfa_1(2, active0, active1);
+   return jjStartNfa_1(2, active0, 0L, 0L);
 }
-static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long old1, long active1)
+static private final int jjMoveStringLiteralDfa4_1(long old0, long active0)
 {
-   if (((active0 &= old0) | (active1 &= old1)) == 0L)
-      return jjStartNfa_1(2, old0, old1); 
+   if (((active0 &= old0)) == 0L)
+      return jjStartNfa_1(2, old0, 0L, 0L);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(3, active0, 0L);
+      jjStopStringLiteralDfa_1(3, active0, 0L, 0L);
       return 4;
    }
    switch(curChar)
@@ -958,15 +965,15 @@ static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long
       default :
          break;
    }
-   return jjStartNfa_1(3, active0, 0L);
+   return jjStartNfa_1(3, active0, 0L, 0L);
 }
 static private final int jjMoveStringLiteralDfa5_1(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_1(3, old0, 0L);
+      return jjStartNfa_1(3, old0, 0L, 0L);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(4, active0, 0L);
+      jjStopStringLiteralDfa_1(4, active0, 0L, 0L);
       return 5;
    }
    switch(curChar)
@@ -1026,15 +1033,15 @@ static private final int jjMoveStringLiteralDfa5_1(long old0, long active0)
       default :
          break;
    }
-   return jjStartNfa_1(4, active0, 0L);
+   return jjStartNfa_1(4, active0, 0L, 0L);
 }
 static private final int jjMoveStringLiteralDfa6_1(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_1(4, old0, 0L);
+      return jjStartNfa_1(4, old0, 0L, 0L);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(5, active0, 0L);
+      jjStopStringLiteralDfa_1(5, active0, 0L, 0L);
       return 6;
    }
    switch(curChar)
@@ -1084,15 +1091,15 @@ static private final int jjMoveStringLiteralDfa6_1(long old0, long active0)
       default :
          break;
    }
-   return jjStartNfa_1(5, active0, 0L);
+   return jjStartNfa_1(5, active0, 0L, 0L);
 }
 static private final int jjMoveStringLiteralDfa7_1(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_1(5, old0, 0L);
+      return jjStartNfa_1(5, old0, 0L, 0L);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(6, active0, 0L);
+      jjStopStringLiteralDfa_1(6, active0, 0L, 0L);
       return 7;
    }
    switch(curChar)
@@ -1114,15 +1121,15 @@ static private final int jjMoveStringLiteralDfa7_1(long old0, long active0)
       default :
          break;
    }
-   return jjStartNfa_1(6, active0, 0L);
+   return jjStartNfa_1(6, active0, 0L, 0L);
 }
 static private final int jjMoveStringLiteralDfa8_1(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_1(6, old0, 0L);
+      return jjStartNfa_1(6, old0, 0L, 0L);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(7, active0, 0L);
+      jjStopStringLiteralDfa_1(7, active0, 0L, 0L);
       return 8;
    }
    switch(curChar)
@@ -1133,15 +1140,15 @@ static private final int jjMoveStringLiteralDfa8_1(long old0, long active0)
       default :
          break;
    }
-   return jjStartNfa_1(7, active0, 0L);
+   return jjStartNfa_1(7, active0, 0L, 0L);
 }
 static private final int jjMoveStringLiteralDfa9_1(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_1(7, old0, 0L);
+      return jjStartNfa_1(7, old0, 0L, 0L);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(8, active0, 0L);
+      jjStopStringLiteralDfa_1(8, active0, 0L, 0L);
       return 9;
    }
    switch(curChar)
@@ -1152,15 +1159,15 @@ static private final int jjMoveStringLiteralDfa9_1(long old0, long active0)
       default :
          break;
    }
-   return jjStartNfa_1(8, active0, 0L);
+   return jjStartNfa_1(8, active0, 0L, 0L);
 }
 static private final int jjMoveStringLiteralDfa10_1(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_1(8, old0, 0L);
+      return jjStartNfa_1(8, old0, 0L, 0L);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(9, active0, 0L);
+      jjStopStringLiteralDfa_1(9, active0, 0L, 0L);
       return 10;
    }
    switch(curChar)
@@ -1171,15 +1178,15 @@ static private final int jjMoveStringLiteralDfa10_1(long old0, long active0)
       default :
          break;
    }
-   return jjStartNfa_1(9, active0, 0L);
+   return jjStartNfa_1(9, active0, 0L, 0L);
 }
 static private final int jjMoveStringLiteralDfa11_1(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_1(9, old0, 0L);
+      return jjStartNfa_1(9, old0, 0L, 0L);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(10, active0, 0L);
+      jjStopStringLiteralDfa_1(10, active0, 0L, 0L);
       return 11;
    }
    switch(curChar)
@@ -1194,7 +1201,7 @@ static private final int jjMoveStringLiteralDfa11_1(long old0, long active0)
       default :
          break;
    }
-   return jjStartNfa_1(10, active0, 0L);
+   return jjStartNfa_1(10, active0, 0L, 0L);
 }
 static final long[] jjbitVec0 = {
    0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL
@@ -1306,8 +1313,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 17:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 126)
-                     kind = 126;
+                  if (kind > 128)
+                     kind = 128;
                   jjstateSet[jjnewStateCnt++] = 17;
                   break;
                case 18:
@@ -1465,7 +1472,7 @@ static private final int jjMoveNfa_1(int startState, int curPos)
             switch(jjstateSet[--i])
             {
                case 3:
-                  if ((0x7fffffe87fffffeL & l) != 0L)
+                  if ((0x87fffffe87fffffeL & l) != 0L)
                   {
                      if (kind > 74)
                         kind = 74;
@@ -1492,7 +1499,7 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                   break;
                case 13:
                case 14:
-                  if ((0x7fffffe87fffffeL & l) == 0L)
+                  if ((0x87fffffe87fffffeL & l) == 0L)
                      break;
                   if (kind > 74)
                      kind = 74;
@@ -1500,10 +1507,10 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                   break;
                case 16:
                case 17:
-                  if ((0x7fffffe87fffffeL & l) == 0L)
+                  if ((0x87fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 126)
-                     kind = 126;
+                  if (kind > 128)
+                     kind = 128;
                   jjCheckNAdd(17);
                   break;
                case 22:
@@ -1605,10 +1612,26 @@ static private final int jjMoveNfa_1(int startState, int curPos)
          {
             switch(jjstateSet[--i])
             {
+               case 3:
+               case 14:
+                  if ((jjbitVec0[i2] & l2) == 0L)
+                     break;
+                  if (kind > 74)
+                     kind = 74;
+                  jjCheckNAdd(14);
+                  break;
                case 1:
                   if ((jjbitVec0[i2] & l2) != 0L && kind > 10)
                      kind = 10;
                   break;
+               case 16:
+               case 17:
+                  if ((jjbitVec0[i2] & l2) == 0L)
+                     break;
+                  if (kind > 128)
+                     kind = 128;
+                  jjCheckNAdd(17);
+                  break;
                case 38:
                   if ((jjbitVec0[i2] & l2) != 0L)
                      jjAddStates(33, 35);
@@ -1695,8 +1718,8 @@ null, null, null, null, null, null, null, null, null, null, null, "\50", "\51",
 "\74", "\41", "\77", "\72", "\75\75", "\74\75", "\76\75", "\41\75", "\174\174", 
 "\46\46", "\53\53", "\55\55", "\53", "\55", "\52", "\57", "\46", "\174", "\136", "\45", 
 "\74\74", "\76\76", "\76\76\76", "\53\75", "\55\75", "\52\75", "\57\75", "\46\75", 
-"\174\75", "\136\75", "\56\75", "\45\75", "\74\74\75", "\76\76\75", "\76\76\76\75", null, 
-"\77\76", };
+"\174\75", "\136\75", "\56\75", "\45\75", "\74\74\75", "\76\76\75", "\41\75\75", 
+"\75\75\75", "\176\75", null, "\77\76", };
 public static final String[] lexStateNames = {
    "DEFAULT", 
    "PHPPARSING", 
@@ -1710,10 +1733,10 @@ public static final int[] jjnewLexState = {
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-   -1, -1, -1, 
+   -1, -1, -1, -1, -1, 
 };
 static final long[] jjtoToken = {
-   0xffffffffffff0007L, 0xffffffffffffc7d1L, 0x0L, 
+   0xffffffffffff0007L, 0xffffffffffffc7d1L, 0x3L, 
 };
 static final long[] jjtoSkip = {
    0x71f8L, 0x0L, 0x0L,