Deleted unicode handling from scanner

[phpeclipse.git] / net.sourceforge.phpeclipse / src / test / PHPParser.java

diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.java b/net.sourceforge.phpeclipse/src/test/PHPParser.java
index da360a9..2dc2240 100644 (file)
--- a/net.sourceforge.phpeclipse/src/test/PHPParser.java
+++ b/net.sourceforge.phpeclipse/src/test/PHPParser.java
@@ -29,6 +29,7 @@ import net.sourceforge.phpdt.internal.compiler.parser.PHPReqIncDeclaration;
  */
 public final class PHPParser extends PHPParserSuperclass implements PHPParserConstants {
 
+  /** The file that is parsed. */
   private static IFile fileToParse;
 
   /** The current segment */
@@ -37,9 +38,15 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
   private static final String PARSE_ERROR_STRING = "Parse error"; //$NON-NLS-1$
   private static final String PARSE_WARNING_STRING = "Warning"; //$NON-NLS-1$
   PHPOutlineInfo outlineInfo;
+
+  /** The error level of the current ParseException. */
   private static int errorLevel = ERROR;
+  /** The message of the current ParseException. If it's null it's because the parse exception wasn't handled */
   private static String errorMessage;
 
+  private static int errorStart = -1;
+  private static int errorEnd = -1;
+
   public PHPParser() {
   }
 
@@ -107,12 +114,23 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
    */
   private static void setMarker(final ParseException e) {
     try {
-      setMarker(fileToParse,
-                errorMessage,
-                jj_input_stream.tokenBegin,
-                jj_input_stream.tokenBegin + e.currentToken.image.length(),
-                errorLevel,
-                "Line " + e.currentToken.beginLine);
+      if (errorStart == -1) {
+        setMarker(fileToParse,
+                  errorMessage,
+                  jj_input_stream.tokenBegin,
+                  jj_input_stream.tokenBegin + e.currentToken.image.length(),
+                  errorLevel,
+                  "Line " + e.currentToken.beginLine);
+      } else {
+        setMarker(fileToParse,
+                  errorMessage,
+                  errorStart,
+                  errorEnd,
+                  errorLevel,
+                  "Line " + e.currentToken.beginLine);
+        errorStart = -1;
+        errorEnd = -1;
+      }
     } catch (CoreException e2) {
       PHPeclipsePlugin.log(e2);
     }
@@ -250,6 +268,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
         case REQUIRE_ONCE:
         case GLOBAL:
         case STATIC:
+        case LIST:
         case CONTINUE:
         case DO:
         case FOR:
@@ -325,6 +344,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
     case REQUIRE_ONCE:
     case GLOBAL:
     case STATIC:
+    case LIST:
     case CONTINUE:
     case DO:
     case FOR:
@@ -361,16 +381,16 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
           break;
         case PHPSTARTSHORT:
           jj_consume_token(PHPSTARTSHORT);
-   try {
-    setMarker(fileToParse,
-              "You should use '<?php' instead of '<?' it will avoid some problems with XML",
-              start,
-              jj_input_stream.bufpos,
-              INFO,
-              "Line " + token.beginLine);
-  } catch (CoreException e) {
-    PHPeclipsePlugin.log(e);
-  }
+     try {
+      setMarker(fileToParse,
+                "You should use '<?php' instead of '<?' it will avoid some problems with XML",
+                start,
+                jj_input_stream.bufpos,
+                INFO,
+                "Line " + token.beginLine);
+    } catch (CoreException e) {
+      PHPeclipsePlugin.log(e);
+    }
           break;
         default:
           jj_la1[2] = jj_gen;
@@ -415,6 +435,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
       case REQUIRE_ONCE:
       case GLOBAL:
       case STATIC:
+      case LIST:
       case CONTINUE:
       case DO:
       case FOR:
@@ -455,13 +476,26 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
   static final public void ClassDeclaration() throws ParseException {
   final PHPClassDeclaration classDeclaration;
   final Token className;
-  final int pos = jj_input_stream.bufpos;
+  final int pos;
     jj_consume_token(CLASS);
-    className = jj_consume_token(IDENTIFIER);
+    try {
+     pos = jj_input_stream.bufpos;
+      className = jj_consume_token(IDENTIFIER);
+    } catch (ParseException e) {
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected";
+    errorLevel   = ERROR;
+    {if (true) throw e;}
+    }
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case EXTENDS:
       jj_consume_token(EXTENDS);
-      jj_consume_token(IDENTIFIER);
+      try {
+        jj_consume_token(IDENTIFIER);
+      } catch (ParseException e) {
+      errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected";
+      errorLevel   = ERROR;
+      {if (true) throw e;}
+      }
       break;
     default:
       jj_la1[6] = jj_gen;
@@ -557,7 +591,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
 
   static final public PHPVarDeclaration VariableDeclarator() throws ParseException {
   final String varName;
-  String varValue = null;
+  String varValue;
   final int pos = jj_input_stream.bufpos;
     varName = VariableDeclaratorId();
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -784,6 +818,7 @@ final StringBuffer buff = new StringBuffer("(");
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case ARRAY:
     case PRINT:
+    case LIST:
     case NEW:
     case NULL:
     case TRUE:
@@ -829,7 +864,16 @@ final StringBuffer buff = new StringBuffer("(");
   static final public void MethodDeclaration() throws ParseException {
   final PHPFunctionDeclaration functionDeclaration;
     jj_consume_token(FUNCTION);
-    functionDeclaration = MethodDeclarator();
+    try {
+      functionDeclaration = MethodDeclarator();
+    } catch (ParseException e) {
+    if (errorMessage != null) {
+      {if (true) throw e;}
+    }
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function identifier expected";
+    errorLevel   = ERROR;
+    {if (true) throw e;}
+    }
     if (currentSegment != null) {
       currentSegment.add(functionDeclaration);
       currentSegment = functionDeclaration;
@@ -982,6 +1026,10 @@ final StringBuffer buff = new StringBuffer("(");
       expr = PrintExpression();
    {if (true) return expr;}
       break;
+    case LIST:
+      expr = ListExpression();
+   {if (true) return expr;}
+      break;
     case ARRAY:
     case NEW:
     case NULL:
@@ -1667,7 +1715,13 @@ final String expr;
         case LPAREN:
           jj_consume_token(LPAREN);
           expr = Expression();
-          jj_consume_token(RPAREN);
+          try {
+            jj_consume_token(RPAREN);
+          } catch (ParseException e) {
+    errorMessage = "')' expected";
+    errorLevel   = ERROR;
+    {if (true) throw e;}
+          }
    {if (true) return "("+expr+")";}
           break;
         default:
@@ -1864,7 +1918,13 @@ final String type, expr;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case CLASSACCESS:
       jj_consume_token(CLASSACCESS);
-      expr = VariableName();
+      try {
+        expr = VariableName();
+      } catch (ParseException e) {
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function call or field access expected";
+    errorLevel   = ERROR;
+    {if (true) throw e;}
+      }
    {if (true) return "->" + expr;}
       break;
     case LBRACKET:
@@ -1872,6 +1932,7 @@ final String type, expr;
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case ARRAY:
       case PRINT:
+      case LIST:
       case NEW:
       case NULL:
       case TRUE:
@@ -1979,6 +2040,7 @@ String expr = null;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case ARRAY:
     case PRINT:
+    case LIST:
     case NEW:
     case NULL:
     case TRUE:
@@ -2006,7 +2068,7 @@ String expr = null;
     try {
       jj_consume_token(RPAREN);
     } catch (ParseException e) {
-    errorMessage = "')' expected to close the argument list";
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected to close the argument list";
     errorLevel   = ERROR;
     {if (true) throw e;}
     }
@@ -2046,10 +2108,10 @@ final StringBuffer buff = new StringBuffer();
     throw new Error("Missing return statement in function");
   }
 
-/*
- * Statement syntax follows.
+/**
+ * A Statement without break
  */
-  static final public void Statement() throws ParseException {
+  static final public void StatementNoBreak() throws ParseException {
     if (jj_2_5(2)) {
       Expression();
       try {
@@ -2114,9 +2176,6 @@ final StringBuffer buff = new StringBuffer();
       case FOREACH:
         ForeachStatement();
         break;
-      case BREAK:
-        BreakStatement();
-        break;
       case CONTINUE:
         ContinueStatement();
         break;
@@ -2155,6 +2214,61 @@ final StringBuffer buff = new StringBuffer();
     }
   }
 
+/**
+ * A Normal statement
+ */
+  static final public void Statement() throws ParseException {
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case IF:
+    case ARRAY:
+    case PRINT:
+    case ECHO:
+    case INCLUDE:
+    case REQUIRE:
+    case INCLUDE_ONCE:
+    case REQUIRE_ONCE:
+    case GLOBAL:
+    case STATIC:
+    case LIST:
+    case CONTINUE:
+    case DO:
+    case FOR:
+    case NEW:
+    case NULL:
+    case RETURN:
+    case SWITCH:
+    case TRUE:
+    case FALSE:
+    case WHILE:
+    case FOREACH:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case STRING_LITERAL:
+    case IDENTIFIER:
+    case LPAREN:
+    case LBRACE:
+    case SEMICOLON:
+    case AT:
+    case DOLLAR:
+    case BANG:
+    case INCR:
+    case DECR:
+    case PLUS:
+    case MINUS:
+    case BIT_AND:
+    case DOLLAR_ID:
+      StatementNoBreak();
+      break;
+    case BREAK:
+      BreakStatement();
+      break;
+    default:
+      jj_la1[71] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+  }
+
   static final public void IncludeStatement() throws ParseException {
   final String expr;
   final int pos = jj_input_stream.bufpos;
@@ -2170,11 +2284,11 @@ final StringBuffer buff = new StringBuffer();
         case SEMICOLON:
           jj_consume_token(SEMICOLON);
           break;
-        case 137:
-          jj_consume_token(137);
+        case 139:
+          jj_consume_token(139);
           break;
         default:
-          jj_la1[71] = jj_gen;
+          jj_la1[72] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -2195,11 +2309,11 @@ final StringBuffer buff = new StringBuffer();
         case SEMICOLON:
           jj_consume_token(SEMICOLON);
           break;
-        case 137:
-          jj_consume_token(137);
+        case 139:
+          jj_consume_token(139);
           break;
         default:
-          jj_la1[72] = jj_gen;
+          jj_la1[73] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -2220,11 +2334,11 @@ final StringBuffer buff = new StringBuffer();
         case SEMICOLON:
           jj_consume_token(SEMICOLON);
           break;
-        case 137:
-          jj_consume_token(137);
+        case 139:
+          jj_consume_token(139);
           break;
         default:
-          jj_la1[73] = jj_gen;
+          jj_la1[74] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -2245,11 +2359,11 @@ final StringBuffer buff = new StringBuffer();
         case SEMICOLON:
           jj_consume_token(SEMICOLON);
           break;
-        case 137:
-          jj_consume_token(137);
+        case 139:
+          jj_consume_token(139);
           break;
         default:
-          jj_la1[74] = jj_gen;
+          jj_la1[75] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -2260,7 +2374,7 @@ final StringBuffer buff = new StringBuffer();
       }
       break;
     default:
-      jj_la1[75] = jj_gen;
+      jj_la1[76] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2276,6 +2390,65 @@ final StringBuffer buff = new StringBuffer();
     throw new Error("Missing return statement in function");
   }
 
+  static final public String ListExpression() throws ParseException {
+  final StringBuffer buff = new StringBuffer("list(");
+  String expr;
+    jj_consume_token(LIST);
+    try {
+      jj_consume_token(LPAREN);
+    } catch (ParseException e) {
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected";
+    errorLevel   = ERROR;
+    {if (true) throw e;}
+    }
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case DOLLAR:
+    case DOLLAR_ID:
+      expr = VariableDeclaratorId();
+     buff.append(expr);
+      break;
+    default:
+      jj_la1[77] = jj_gen;
+      ;
+    }
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case COMMA:
+      try {
+        jj_consume_token(COMMA);
+      } catch (ParseException e) {
+      errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ',' expected";
+      errorLevel   = ERROR;
+      {if (true) throw e;}
+      }
+      expr = VariableDeclaratorId();
+     buff.append(",").append(expr);
+      break;
+    default:
+      jj_la1[78] = jj_gen;
+      ;
+    }
+   buff.append(")");
+    try {
+      jj_consume_token(RPAREN);
+    } catch (ParseException e) {
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected";
+    errorLevel   = ERROR;
+    {if (true) throw e;}
+    }
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case ASSIGN:
+      jj_consume_token(ASSIGN);
+      expr = Expression();
+                                  buff.append("(").append(expr);
+      break;
+    default:
+      jj_la1[79] = jj_gen;
+      ;
+    }
+   {if (true) return buff.toString();}
+    throw new Error("Missing return statement in function");
+  }
+
   static final public void EchoStatement() throws ParseException {
     jj_consume_token(ECHO);
     Expression();
@@ -2286,7 +2459,7 @@ final StringBuffer buff = new StringBuffer();
         ;
         break;
       default:
-        jj_la1[76] = jj_gen;
+        jj_la1[80] = jj_gen;
         break label_23;
       }
       jj_consume_token(COMMA);
@@ -2297,11 +2470,11 @@ final StringBuffer buff = new StringBuffer();
       case SEMICOLON:
         jj_consume_token(SEMICOLON);
         break;
-      case 137:
-        jj_consume_token(137);
+      case 139:
+        jj_consume_token(139);
         break;
       default:
-        jj_la1[77] = jj_gen;
+        jj_la1[81] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2322,7 +2495,7 @@ final StringBuffer buff = new StringBuffer();
         ;
         break;
       default:
-        jj_la1[78] = jj_gen;
+        jj_la1[82] = jj_gen;
         break label_24;
       }
       jj_consume_token(COMMA);
@@ -2333,11 +2506,11 @@ final StringBuffer buff = new StringBuffer();
       case SEMICOLON:
         jj_consume_token(SEMICOLON);
         break;
-      case 137:
-        jj_consume_token(137);
+      case 139:
+        jj_consume_token(139);
         break;
       default:
-        jj_la1[79] = jj_gen;
+        jj_la1[83] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2358,7 +2531,7 @@ final StringBuffer buff = new StringBuffer();
         ;
         break;
       default:
-        jj_la1[80] = jj_gen;
+        jj_la1[84] = jj_gen;
         break label_25;
       }
       jj_consume_token(COMMA);
@@ -2369,11 +2542,11 @@ final StringBuffer buff = new StringBuffer();
       case SEMICOLON:
         jj_consume_token(SEMICOLON);
         break;
-      case 137:
-        jj_consume_token(137);
+      case 139:
+        jj_consume_token(139);
         break;
       default:
-        jj_la1[81] = jj_gen;
+        jj_la1[85] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2414,6 +2587,7 @@ final StringBuffer buff = new StringBuffer();
       case REQUIRE_ONCE:
       case GLOBAL:
       case STATIC:
+      case LIST:
       case CONTINUE:
       case DO:
       case FOR:
@@ -2444,12 +2618,18 @@ final StringBuffer buff = new StringBuffer();
         ;
         break;
       default:
-        jj_la1[82] = jj_gen;
+        jj_la1[86] = jj_gen;
         break label_26;
       }
       BlockStatement();
     }
-    jj_consume_token(RBRACE);
+    try {
+      jj_consume_token(RBRACE);
+    } catch (ParseException e) {
+    errorMessage = "unexpected token : '"+ e.currentToken.image +"', '}' expected";
+    errorLevel   = ERROR;
+    {if (true) throw e;}
+    }
   }
 
   static final public void BlockStatement() throws ParseException {
@@ -2465,6 +2645,7 @@ final StringBuffer buff = new StringBuffer();
     case REQUIRE_ONCE:
     case GLOBAL:
     case STATIC:
+    case LIST:
     case CONTINUE:
     case DO:
     case FOR:
@@ -2501,7 +2682,65 @@ final StringBuffer buff = new StringBuffer();
       MethodDeclaration();
       break;
     default:
-      jj_la1[83] = jj_gen;
+      jj_la1[87] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+  }
+
+/**
+ * A Block statement that will not contain any 'break'
+ */
+  static final public void BlockStatementNoBreak() throws ParseException {
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case IF:
+    case ARRAY:
+    case PRINT:
+    case ECHO:
+    case INCLUDE:
+    case REQUIRE:
+    case INCLUDE_ONCE:
+    case REQUIRE_ONCE:
+    case GLOBAL:
+    case STATIC:
+    case LIST:
+    case CONTINUE:
+    case DO:
+    case FOR:
+    case NEW:
+    case NULL:
+    case RETURN:
+    case SWITCH:
+    case TRUE:
+    case FALSE:
+    case WHILE:
+    case FOREACH:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case STRING_LITERAL:
+    case IDENTIFIER:
+    case LPAREN:
+    case LBRACE:
+    case SEMICOLON:
+    case AT:
+    case DOLLAR:
+    case BANG:
+    case INCR:
+    case DECR:
+    case PLUS:
+    case MINUS:
+    case BIT_AND:
+    case DOLLAR_ID:
+      StatementNoBreak();
+      break;
+    case CLASS:
+      ClassDeclaration();
+      break;
+    case FUNCTION:
+      MethodDeclaration();
+      break;
+    default:
+      jj_la1[88] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2516,7 +2755,7 @@ final StringBuffer buff = new StringBuffer();
         ;
         break;
       default:
-        jj_la1[84] = jj_gen;
+        jj_la1[89] = jj_gen;
         break label_27;
       }
       jj_consume_token(COMMA);
@@ -2532,7 +2771,7 @@ final StringBuffer buff = new StringBuffer();
       Expression();
       break;
     default:
-      jj_la1[85] = jj_gen;
+      jj_la1[90] = jj_gen;
       ;
     }
   }
@@ -2595,29 +2834,49 @@ final StringBuffer buff = new StringBuffer();
           Expression();
           break;
         default:
-          jj_la1[86] = jj_gen;
+          jj_la1[91] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
         break;
       default:
-        jj_la1[87] = jj_gen;
+        jj_la1[92] = jj_gen;
         ;
       }
       break;
     default:
-      jj_la1[88] = jj_gen;
+      jj_la1[93] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
   }
 
   static final public void SwitchStatement() throws ParseException {
+  Token breakToken = null;
+  int line;
     jj_consume_token(SWITCH);
-    jj_consume_token(LPAREN);
+    try {
+      jj_consume_token(LPAREN);
+    } catch (ParseException e) {
+    errorMessage = "'(' expected after 'switch'";
+    errorLevel   = ERROR;
+    {if (true) throw e;}
+    }
     Expression();
-    jj_consume_token(RPAREN);
-    jj_consume_token(LBRACE);
+    try {
+      jj_consume_token(RPAREN);
+    } catch (ParseException e) {
+    errorMessage = "')' expected";
+    errorLevel   = ERROR;
+    {if (true) throw e;}
+    }
+    try {
+      jj_consume_token(LBRACE);
+    } catch (ParseException e) {
+    errorMessage = "'{' expected";
+    errorLevel   = ERROR;
+    {if (true) throw e;}
+    }
     label_28:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -2626,10 +2885,10 @@ final StringBuffer buff = new StringBuffer();
         ;
         break;
       default:
-        jj_la1[89] = jj_gen;
+        jj_la1[94] = jj_gen;
         break label_28;
       }
-      SwitchLabel();
+      line = SwitchLabel();
       label_29:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -2637,7 +2896,6 @@ final StringBuffer buff = new StringBuffer();
         case FUNCTION:
         case IF:
         case ARRAY:
-        case BREAK:
         case PRINT:
         case ECHO:
         case INCLUDE:
@@ -2646,6 +2904,7 @@ final StringBuffer buff = new StringBuffer();
         case REQUIRE_ONCE:
         case GLOBAL:
         case STATIC:
+        case LIST:
         case CONTINUE:
         case DO:
         case FOR:
@@ -2676,31 +2935,86 @@ final StringBuffer buff = new StringBuffer();
           ;
           break;
         default:
-          jj_la1[90] = jj_gen;
+          jj_la1[95] = jj_gen;
           break label_29;
         }
-        BlockStatement();
+        BlockStatementNoBreak();
       }
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case BREAK:
+        breakToken = jj_consume_token(BREAK);
+        try {
+          jj_consume_token(SEMICOLON);
+        } catch (ParseException e) {
+          errorMessage = "';' expected after 'break' keyword";
+          errorLevel   = ERROR;
+          {if (true) throw e;}
+        }
+        break;
+      default:
+        jj_la1[96] = jj_gen;
+        ;
+      }
+        try {
+          if (breakToken == null) {
+            setMarker(fileToParse,
+                      "You should use put a 'break' at the end of your statement",
+                      line,
+                      INFO,
+                      "Line " + line);
+          }
+        } catch (CoreException e) {
+          PHPeclipsePlugin.log(e);
+        }
+    }
+    try {
+      jj_consume_token(RBRACE);
+    } catch (ParseException e) {
+    errorMessage = "'}' expected";
+    errorLevel   = ERROR;
+    {if (true) throw e;}
     }
-    jj_consume_token(RBRACE);
   }
 
-  static final public void SwitchLabel() throws ParseException {
+  static final public int SwitchLabel() throws ParseException {
+  final Token token;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case CASE:
-      jj_consume_token(CASE);
-      Expression();
-      jj_consume_token(COLON);
+      token = jj_consume_token(CASE);
+      try {
+        Expression();
+      } catch (ParseException e) {
+    if (errorMessage != null) {if (true) throw e;}
+    errorMessage = "expression expected after 'case' keyword";
+    errorLevel   = ERROR;
+    {if (true) throw e;}
+      }
+      try {
+        jj_consume_token(COLON);
+      } catch (ParseException e) {
+    errorMessage = "':' expected after case expression";
+    errorLevel   = ERROR;
+    {if (true) throw e;}
+      }
+   {if (true) return token.beginLine;}
       break;
     case _DEFAULT:
-      jj_consume_token(_DEFAULT);
-      jj_consume_token(COLON);
+      token = jj_consume_token(_DEFAULT);
+      try {
+        jj_consume_token(COLON);
+      } catch (ParseException e) {
+    errorMessage = "':' expected after 'default' keyword";
+    errorLevel   = ERROR;
+    {if (true) throw e;}
+      }
+   {if (true) return token.beginLine;}
       break;
     default:
-      jj_la1[91] = jj_gen;
+      jj_la1[97] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
+    throw new Error("Missing return statement in function");
   }
 
   static final public void IfStatement() throws ParseException {
@@ -2747,6 +3061,7 @@ final StringBuffer buff = new StringBuffer();
         case REQUIRE_ONCE:
         case GLOBAL:
         case STATIC:
+        case LIST:
         case CONTINUE:
         case DO:
         case FOR:
@@ -2777,7 +3092,7 @@ final StringBuffer buff = new StringBuffer();
           ;
           break;
         default:
-          jj_la1[92] = jj_gen;
+          jj_la1[98] = jj_gen;
           break label_30;
         }
         Statement();
@@ -2789,7 +3104,7 @@ final StringBuffer buff = new StringBuffer();
           ;
           break;
         default:
-          jj_la1[93] = jj_gen;
+          jj_la1[99] = jj_gen;
           break label_31;
         }
         ElseIfStatementColon();
@@ -2799,7 +3114,7 @@ final StringBuffer buff = new StringBuffer();
         ElseStatementColon();
         break;
       default:
-        jj_la1[94] = jj_gen;
+        jj_la1[100] = jj_gen;
         ;
       }
    try {
@@ -2822,7 +3137,7 @@ final StringBuffer buff = new StringBuffer();
       try {
         jj_consume_token(SEMICOLON);
       } catch (ParseException e) {
-    errorMessage = "';' expected 'endif' keyword";
+    errorMessage = "';' expected after 'endif' keyword";
     errorLevel   = ERROR;
     {if (true) throw e;}
       }
@@ -2838,6 +3153,7 @@ final StringBuffer buff = new StringBuffer();
     case REQUIRE_ONCE:
     case GLOBAL:
     case STATIC:
+    case LIST:
     case CONTINUE:
     case DO:
     case FOR:
@@ -2873,7 +3189,7 @@ final StringBuffer buff = new StringBuffer();
           ;
           break;
         default:
-          jj_la1[95] = jj_gen;
+          jj_la1[101] = jj_gen;
           break label_32;
         }
         ElseIfStatement();
@@ -2884,12 +3200,12 @@ final StringBuffer buff = new StringBuffer();
         Statement();
         break;
       default:
-        jj_la1[96] = jj_gen;
+        jj_la1[102] = jj_gen;
         ;
       }
       break;
     default:
-      jj_la1[97] = jj_gen;
+      jj_la1[103] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2913,6 +3229,7 @@ final StringBuffer buff = new StringBuffer();
       case REQUIRE_ONCE:
       case GLOBAL:
       case STATIC:
+      case LIST:
       case CONTINUE:
       case DO:
       case FOR:
@@ -2943,7 +3260,7 @@ final StringBuffer buff = new StringBuffer();
         ;
         break;
       default:
-        jj_la1[98] = jj_gen;
+        jj_la1[104] = jj_gen;
         break label_33;
       }
       Statement();
@@ -2967,6 +3284,7 @@ final StringBuffer buff = new StringBuffer();
       case REQUIRE_ONCE:
       case GLOBAL:
       case STATIC:
+      case LIST:
       case CONTINUE:
       case DO:
       case FOR:
@@ -2997,7 +3315,7 @@ final StringBuffer buff = new StringBuffer();
         ;
         break;
       default:
-        jj_la1[99] = jj_gen;
+        jj_la1[105] = jj_gen;
         break label_34;
       }
       Statement();
@@ -3036,6 +3354,7 @@ final StringBuffer buff = new StringBuffer();
         case REQUIRE_ONCE:
         case GLOBAL:
         case STATIC:
+        case LIST:
         case CONTINUE:
         case DO:
         case FOR:
@@ -3066,7 +3385,7 @@ final StringBuffer buff = new StringBuffer();
           ;
           break;
         default:
-          jj_la1[100] = jj_gen;
+          jj_la1[106] = jj_gen;
           break label_35;
         }
         Statement();
@@ -3093,11 +3412,11 @@ final StringBuffer buff = new StringBuffer();
         case SEMICOLON:
           jj_consume_token(SEMICOLON);
           break;
-        case 137:
-          jj_consume_token(137);
+        case 139:
+          jj_consume_token(139);
           break;
         default:
-          jj_la1[101] = jj_gen;
+          jj_la1[107] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -3118,6 +3437,7 @@ final StringBuffer buff = new StringBuffer();
     case REQUIRE_ONCE:
     case GLOBAL:
     case STATIC:
+    case LIST:
     case CONTINUE:
     case DO:
     case FOR:
@@ -3148,7 +3468,7 @@ final StringBuffer buff = new StringBuffer();
       Statement();
       break;
     default:
-      jj_la1[102] = jj_gen;
+      jj_la1[108] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3164,11 +3484,11 @@ final StringBuffer buff = new StringBuffer();
       case SEMICOLON:
         jj_consume_token(SEMICOLON);
         break;
-      case 137:
-        jj_consume_token(137);
+      case 139:
+        jj_consume_token(139);
         break;
       default:
-        jj_la1[103] = jj_gen;
+        jj_la1[109] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3201,7 +3521,7 @@ final StringBuffer buff = new StringBuffer();
       VariableSuffix();
       break;
     default:
-      jj_la1[104] = jj_gen;
+      jj_la1[110] = jj_gen;
       ;
     }
     try {
@@ -3224,7 +3544,7 @@ final StringBuffer buff = new StringBuffer();
       Expression();
       break;
     default:
-      jj_la1[105] = jj_gen;
+      jj_la1[111] = jj_gen;
       ;
     }
     try {
@@ -3266,13 +3586,14 @@ final int pos = jj_input_stream.bufpos;
       ForInit();
       break;
     default:
-      jj_la1[106] = jj_gen;
+      jj_la1[112] = jj_gen;
       ;
     }
     jj_consume_token(SEMICOLON);
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case ARRAY:
     case PRINT:
+    case LIST:
     case NEW:
     case NULL:
     case TRUE:
@@ -3294,7 +3615,7 @@ final int pos = jj_input_stream.bufpos;
       Expression();
       break;
     default:
-      jj_la1[107] = jj_gen;
+      jj_la1[113] = jj_gen;
       ;
     }
     jj_consume_token(SEMICOLON);
@@ -3306,10 +3627,10 @@ final int pos = jj_input_stream.bufpos;
     case INCR:
     case DECR:
     case DOLLAR_ID:
-      ForUpdate();
+      StatementExpressionList();
       break;
     default:
-      jj_la1[108] = jj_gen;
+      jj_la1[114] = jj_gen;
       ;
     }
     jj_consume_token(RPAREN);
@@ -3325,6 +3646,7 @@ final int pos = jj_input_stream.bufpos;
     case REQUIRE_ONCE:
     case GLOBAL:
     case STATIC:
+    case LIST:
     case CONTINUE:
     case DO:
     case FOR:
@@ -3370,6 +3692,7 @@ final int pos = jj_input_stream.bufpos;
         case REQUIRE_ONCE:
         case GLOBAL:
         case STATIC:
+        case LIST:
         case CONTINUE:
         case DO:
         case FOR:
@@ -3400,7 +3723,7 @@ final int pos = jj_input_stream.bufpos;
           ;
           break;
         default:
-          jj_la1[109] = jj_gen;
+          jj_la1[115] = jj_gen;
           break label_36;
         }
         Statement();
@@ -3425,13 +3748,13 @@ final int pos = jj_input_stream.bufpos;
       try {
         jj_consume_token(SEMICOLON);
       } catch (ParseException e) {
-        errorMessage = "';' expected 'endfor' keyword";
+        errorMessage = "';' expected after 'endfor' keyword";
         errorLevel   = ERROR;
         {if (true) throw e;}
       }
       break;
     default:
-      jj_la1[110] = jj_gen;
+      jj_la1[116] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3452,7 +3775,7 @@ final int pos = jj_input_stream.bufpos;
         StatementExpressionList();
         break;
       default:
-        jj_la1[111] = jj_gen;
+        jj_la1[117] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3468,7 +3791,7 @@ final int pos = jj_input_stream.bufpos;
         ;
         break;
       default:
-        jj_la1[112] = jj_gen;
+        jj_la1[118] = jj_gen;
         break label_37;
       }
       jj_consume_token(COMMA);
@@ -3476,10 +3799,6 @@ final int pos = jj_input_stream.bufpos;
     }
   }
 
-  static final public void ForUpdate() throws ParseException {
-    StatementExpressionList();
-  }
-
   static final public void BreakStatement() throws ParseException {
     jj_consume_token(BREAK);
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -3487,10 +3806,16 @@ final int pos = jj_input_stream.bufpos;
       jj_consume_token(IDENTIFIER);
       break;
     default:
-      jj_la1[113] = jj_gen;
+      jj_la1[119] = jj_gen;
       ;
     }
-    jj_consume_token(SEMICOLON);
+    try {
+      jj_consume_token(SEMICOLON);
+    } catch (ParseException e) {
+    errorMessage = "';' expected after 'break' statement";
+    errorLevel   = ERROR;
+    {if (true) throw e;}
+    }
   }
 
   static final public void ContinueStatement() throws ParseException {
@@ -3500,10 +3825,16 @@ final int pos = jj_input_stream.bufpos;
       jj_consume_token(IDENTIFIER);
       break;
     default:
-      jj_la1[114] = jj_gen;
+      jj_la1[120] = jj_gen;
       ;
     }
-    jj_consume_token(SEMICOLON);
+    try {
+      jj_consume_token(SEMICOLON);
+    } catch (ParseException e) {
+    errorMessage = "';' expected after 'continue' statement";
+    errorLevel   = ERROR;
+    {if (true) throw e;}
+    }
   }
 
   static final public void ReturnStatement() throws ParseException {
@@ -3511,6 +3842,7 @@ final int pos = jj_input_stream.bufpos;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case ARRAY:
     case PRINT:
+    case LIST:
     case NEW:
     case NULL:
     case TRUE:
@@ -3532,10 +3864,16 @@ final int pos = jj_input_stream.bufpos;
       Expression();
       break;
     default:
-      jj_la1[115] = jj_gen;
+      jj_la1[121] = jj_gen;
       ;
     }
-    jj_consume_token(SEMICOLON);
+    try {
+      jj_consume_token(SEMICOLON);
+    } catch (ParseException e) {
+    errorMessage = "';' expected after 'return' statement";
+    errorLevel   = ERROR;
+    {if (true) throw e;}
+    }
   }
 
   static final private boolean jj_2_1(int xla) {
@@ -3587,457 +3925,256 @@ final int pos = jj_input_stream.bufpos;
     return retval;
   }
 
-  static final private boolean jj_3R_70() {
-    if (jj_scan_token(DOLLAR)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_61()) 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(SEMICOLON)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_118() {
-    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_117() {
-    if (jj_scan_token(BANGDOUBLEEQUAL)) 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(NE)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_115() {
-    if (jj_scan_token(DIF)) 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(EQ)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3_5() {
-    if (jj_3R_41()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_42()) {
-    jj_scanpos = xsp;
-    if (jj_3R_43()) 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_97() {
-    if (jj_scan_token(LBRACE)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_41()) 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_69() {
-    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_104()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_111() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_114()) {
-    jj_scanpos = xsp;
-    if (jj_3R_115()) {
-    jj_scanpos = xsp;
-    if (jj_3R_116()) {
-    jj_scanpos = xsp;
-    if (jj_3R_117()) {
-    jj_scanpos = xsp;
-    if (jj_3R_118()) 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_110()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_68() {
-    if (jj_scan_token(LBRACE)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_41()) 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_61() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_68()) {
-    jj_scanpos = xsp;
-    if (jj_3R_69()) {
-    jj_scanpos = xsp;
-    if (jj_3R_70()) {
-    jj_scanpos = xsp;
-    if (jj_3R_71()) 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_108() {
-    if (jj_3R_110()) return true;
+  static final private boolean jj_3R_107() {
+    if (jj_3R_111()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_111()) { jj_scanpos = xsp; break; }
+      if (jj_3R_112()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_92() {
-    if (jj_scan_token(DOLLAR)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_61()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_109() {
-    if (jj_scan_token(BIT_AND)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_108()) return true;
+  static final private boolean jj_3R_182() {
+    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_192() {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_41()) return true;
+  static final private boolean jj_3_1() {
+    if (jj_3R_38()) 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(DOLLAR_ID)) return true;
+  static final private boolean jj_3R_181() {
+    if (jj_scan_token(TRUE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    xsp = jj_scanpos;
-    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_75() {
+  static final private boolean jj_3R_174() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_91()) {
+    if (jj_3R_181()) {
     jj_scanpos = xsp;
-    if (jj_3R_92()) return true;
+    if (jj_3R_182()) 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_191() {
-    if (jj_3R_41()) return true;
+  static final private boolean jj_3R_68() {
+    if (jj_3R_77()) 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_3_1()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_106() {
-    if (jj_3R_108()) return true;
+  static final private boolean jj_3R_170() {
+    if (jj_3R_175()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_109()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
     return false;
   }
 
-  static final private boolean jj_3R_189() {
-    if (jj_3R_191()) return true;
+  static final private boolean jj_3R_108() {
+    if (jj_scan_token(BIT_OR)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3_1() {
-    if (jj_3R_38()) return true;
+    if (jj_3R_107()) 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(XOR)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_106()) 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;
     return false;
   }
 
-  static final private boolean jj_3R_66() {
-    if (jj_3R_75()) return true;
+  static final private boolean jj_3R_100() {
+    if (jj_3R_107()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3_1()) { jj_scanpos = xsp; break; }
+      if (jj_3R_108()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_187() {
-    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_189()) 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_3R_168() {
+    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_102() {
-    if (jj_3R_106()) return true;
+  static final private boolean jj_3R_69() {
+    if (jj_scan_token(ASSIGN)) 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_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
-    return false;
-  }
-
-  static final private boolean jj_3R_170() {
-    if (jj_scan_token(NULL)) return true;
+    if (jj_3R_41()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_103() {
-    if (jj_scan_token(BIT_OR)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_102()) return true;
+  static final private boolean jj_3R_167() {
+    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_177() {
-    if (jj_scan_token(FALSE)) return true;
+  static final private boolean jj_3R_61() {
+    if (jj_scan_token(COMMA)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_98() {
-    if (jj_3R_102()) return true;
+    if (jj_3R_60()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_103()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
     return false;
   }
 
-  static final private boolean jj_3R_176() {
-    if (jj_scan_token(TRUE)) return true;
+  static final private boolean jj_3R_103() {
+    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_169() {
+  static final private boolean jj_3R_163() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_176()) {
+    if (jj_3R_166()) {
+    jj_scanpos = xsp;
+    if (jj_3R_167()) {
+    jj_scanpos = xsp;
+    if (jj_3R_168()) {
     jj_scanpos = xsp;
-    if (jj_3R_177()) return true;
+    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;
+    } 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_101() {
-    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_165() {
-    if (jj_3R_170()) return true;
+  static final private boolean jj_3R_166() {
+    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_99() {
+  static final private boolean jj_3R_101() {
     if (jj_scan_token(DOT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_98()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_164() {
-    if (jj_3R_169()) return true;
+    if (jj_3R_100()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_93() {
-    if (jj_3R_98()) return true;
+  static final private boolean jj_3R_95() {
+    if (jj_3R_100()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_99()) { jj_scanpos = xsp; break; }
+      if (jj_3R_101()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_163() {
-    if (jj_scan_token(STRING_LITERAL)) return true;
+  static final private boolean jj_3R_63() {
+    if (jj_3R_41()) 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(FLOATING_POINT_LITERAL)) return true;
+  static final private boolean jj_3R_98() {
+    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_158() {
+  static final private boolean jj_3R_60() {
+    if (jj_3R_68()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_161()) {
-    jj_scanpos = xsp;
-    if (jj_3R_162()) {
-    jj_scanpos = xsp;
-    if (jj_3R_163()) {
-    jj_scanpos = xsp;
-    if (jj_3R_164()) {
-    jj_scanpos = xsp;
-    if (jj_3R_165()) 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_69()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_161() {
-    if (jj_scan_token(INTEGER_LITERAL)) return true;
+  static final private boolean jj_3R_102() {
+    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_96() {
-    if (jj_scan_token(_ORL)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_102()) {
+    jj_scanpos = xsp;
+    if (jj_3R_103()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_100() {
-    if (jj_scan_token(SC_AND)) return true;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_95()) return true;
     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_47() {
+    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()) 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_93()) return true;
+    if (jj_3R_63()) 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_62() {
-    if (jj_3R_41()) return true;
+  static final private boolean jj_3R_78() {
+    if (jj_3R_95()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_96()) { 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_3R_93()) return true;
+  static final private boolean jj_3R_45() {
+    if (jj_3R_60()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_94()) { jj_scanpos = xsp; break; }
+      if (jj_3R_61()) { jj_scanpos = xsp; break; }
       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_75() {
     if (jj_scan_token(HOOK)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     if (jj_3R_41()) 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_64()) 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(LBRACKET)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_62()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(RBRACKET)) return true;
+    if (jj_3R_66()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
@@ -4045,7 +4182,7 @@ final int pos = jj_input_stream.bufpos;
   static final private boolean jj_3R_46() {
     if (jj_scan_token(CLASSACCESS)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_61()) return true;
+    if (jj_3R_62()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
@@ -4061,242 +4198,277 @@ final int pos = jj_input_stream.bufpos;
     return false;
   }
 
-  static final private boolean jj_3R_95() {
-    if (jj_scan_token(SC_OR)) return true;
+  static final private boolean jj_3_7() {
+    if (jj_3R_45()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_77() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_95()) {
-    jj_scanpos = xsp;
-    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_76()) return true;
+  static final private boolean jj_3R_97() {
+    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_72() {
-    if (jj_3R_76()) return true;
+  static final private boolean jj_3R_189() {
+    if (jj_3R_38()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_77()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
     return false;
   }
 
-  static final private boolean jj_3R_184() {
-    if (jj_3R_38()) return true;
+  static final private boolean jj_3R_79() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_97()) {
+    jj_scanpos = xsp;
+    if (jj_3R_98()) 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_78()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_183() {
-    if (jj_3R_187()) return true;
+  static final private boolean jj_3R_188() {
+    if (jj_3R_192()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_179() {
+  static final private boolean jj_3R_184() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_183()) {
+    if (jj_3R_188()) {
     jj_scanpos = xsp;
-    if (jj_3R_184()) return true;
+    if (jj_3R_189()) 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_186() {
-    if (jj_3R_66()) return true;
+  static final private boolean jj_3R_74() {
+    if (jj_3R_78()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_79()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
+    return false;
+  }
+
+  static final private boolean jj_3R_191() {
+    if (jj_3R_68()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_185() {
+  static final private boolean jj_3R_190() {
     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_181() {
+  static final private boolean jj_3R_186() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_185()) {
+    if (jj_3R_190()) {
     jj_scanpos = xsp;
-    if (jj_3R_186()) return true;
+    if (jj_3R_191()) 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_64() {
-    if (jj_3R_72()) return true;
+  static final private boolean jj_3R_66() {
+    if (jj_3R_74()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_73()) jj_scanpos = xsp;
+    if (jj_3R_75()) jj_scanpos = xsp;
     else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_173() {
-    if (jj_3R_66()) return true;
+  static final private boolean jj_3R_178() {
+    if (jj_3R_68()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_90() {
-    if (jj_scan_token(TILDEEQUAL)) return true;
+  static final private boolean jj_3R_177() {
+    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_89() {
-    if (jj_scan_token(DOTASSIGN)) return true;
+  static final private boolean jj_3R_180() {
+    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_67() {
-    if (jj_scan_token(ASSIGN)) return true;
+  static final private boolean jj_3R_176() {
+    if (jj_scan_token(IDENTIFIER)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_41()) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_92() {
+    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_88() {
-    if (jj_scan_token(ORASSIGN)) return true;
+  static final private boolean jj_3R_171() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_176()) {
+    jj_scanpos = xsp;
+    if (jj_3R_177()) {
+    jj_scanpos = xsp;
+    if (jj_3R_178()) 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_172() {
-    if (jj_scan_token(NEW)) return true;
+  static final private boolean jj_3R_44() {
+    if (jj_scan_token(IDENTIFIER)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_181()) return true;
+    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_175() {
-    if (jj_scan_token(DECR)) return true;
+  static final private boolean jj_3R_91() {
+    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_87() {
-    if (jj_scan_token(XORASSIGN)) return true;
+  static final private boolean jj_3R_90() {
+    if (jj_scan_token(ORASSIGN)) 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(COMMA)) return true;
+  static final private boolean jj_3R_89() {
+    if (jj_scan_token(XORASSIGN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_59()) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_88() {
+    if (jj_scan_token(ANDASSIGN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_166() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_171()) {
-    jj_scanpos = xsp;
-    if (jj_3R_172()) {
-    jj_scanpos = xsp;
-    if (jj_3R_173()) return true;
+  static final private boolean jj_3R_87() {
+    if (jj_scan_token(RSIGNEDSHIFTASSIGN)) 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_171() {
-    if (jj_scan_token(IDENTIFIER)) return true;
+  static final private boolean jj_3R_172() {
+    if (jj_scan_token(ARRAY)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_185()) 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(ANDASSIGN)) return true;
+    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_85() {
-    if (jj_scan_token(RSIGNEDSHIFTASSIGN)) return true;
+    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_84() {
-    if (jj_scan_token(LSHIFTASSIGN)) return true;
+    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_83() {
-    if (jj_scan_token(MINUSASSIGN)) return true;
+    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_82() {
-    if (jj_scan_token(PLUSASSIGN)) return true;
+  static final private boolean jj_3R_179() {
+    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_167() {
-    if (jj_scan_token(ARRAY)) return true;
+  static final private boolean jj_3R_165() {
+    if (jj_3R_172()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_173() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_179()) {
+    jj_scanpos = xsp;
     if (jj_3R_180()) 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_81() {
-    if (jj_scan_token(REMASSIGN)) return true;
+  static final private boolean jj_3R_183() {
+    if (jj_3R_184()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_80() {
+  static final private boolean jj_3R_82() {
     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_79() {
+  static final private boolean jj_3R_81() {
     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_78() {
+  static final private boolean jj_3R_164() {
+    if (jj_3R_171()) 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_80() {
     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_74() {
+  static final private boolean jj_3R_76() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_78()) {
-    jj_scanpos = xsp;
-    if (jj_3R_79()) {
-    jj_scanpos = xsp;
     if (jj_3R_80()) {
     jj_scanpos = xsp;
     if (jj_3R_81()) {
@@ -4317,7 +4489,11 @@ final int pos = jj_input_stream.bufpos;
     jj_scanpos = xsp;
     if (jj_3R_89()) {
     jj_scanpos = xsp;
-    if (jj_3R_90()) return true;
+    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;
@@ -4334,31 +4510,46 @@ final int pos = jj_input_stream.bufpos;
     return false;
   }
 
-  static final private boolean jj_3R_174() {
-    if (jj_scan_token(INCR)) return true;
+  static final private boolean jj_3R_187() {
+    if (jj_3R_184()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_160() {
-    if (jj_3R_167()) return true;
+  static final private boolean jj_3_4() {
+    if (jj_scan_token(IDENTIFIER)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    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_187()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
     return false;
   }
 
-  static final private boolean jj_3R_168() {
+  static final private boolean jj_3R_160() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_174()) {
+    if (jj_3_4()) {
     jj_scanpos = xsp;
-    if (jj_3R_175()) return true;
+    if (jj_3R_164()) {
+    jj_scanpos = xsp;
+    if (jj_3R_165()) 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_178() {
-    if (jj_3R_179()) return true;
+  static final private boolean jj_3R_67() {
+    if (jj_3R_76()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_41()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
@@ -4373,108 +4564,59 @@ final int pos = jj_input_stream.bufpos;
     return false;
   }
 
-  static final private boolean jj_3R_159() {
-    if (jj_3R_166()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_178()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
-    return false;
-  }
-
-  static final private boolean jj_3R_45() {
-    if (jj_3R_59()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_60()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
-    return false;
-  }
-
-  static final private boolean jj_3R_182() {
-    if (jj_3R_179()) return true;
+  static final private boolean jj_3R_58() {
+    if (jj_3R_65()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_65() {
-    if (jj_3R_74()) return true;
+  static final private boolean jj_3R_106() {
+    if (jj_scan_token(ASSIGN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     if (jj_3R_41()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3_4() {
-    if (jj_scan_token(IDENTIFIER)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(STATICCLASSACCESS)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_181()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_182()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
-    return false;
-  }
-
-  static final private boolean jj_3R_155() {
+  static final private boolean jj_3R_41() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3_4()) {
+    if (jj_3R_57()) {
     jj_scanpos = xsp;
-    if (jj_3R_159()) {
+    if (jj_3R_58()) {
     jj_scanpos = xsp;
-    if (jj_3R_160()) return true;
+    if (jj_3R_59()) 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_58() {
+  static final private boolean jj_3R_57() {
     if (jj_3R_64()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_65()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_41() {
+  static final private boolean jj_3R_162() {
+    if (jj_3R_160()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_57()) {
-    jj_scanpos = xsp;
-    if (jj_3R_58()) 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_173()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_57() {
-    if (jj_3R_63()) return true;
+  static final private boolean jj_3R_161() {
+    if (jj_scan_token(LPAREN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_157() {
-    if (jj_3R_155()) return true;
+    if (jj_3R_40()) 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_135()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_168()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
@@ -4490,16 +4632,22 @@ final int pos = jj_input_stream.bufpos;
     return false;
   }
 
+  static final private boolean jj_3R_105() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_68()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
   static final private boolean jj_3R_54() {
     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_44() {
-    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_104() {
+    if (jj_3R_68()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
@@ -4510,21 +4658,19 @@ final int pos = jj_input_stream.bufpos;
     return false;
   }
 
-  static final private boolean jj_3R_156() {
+  static final private boolean jj_3R_52() {
+    if (jj_scan_token(DOUBLE)) 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_40()) 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_130()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_52() {
-    if (jj_scan_token(DOUBLE)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
@@ -4534,10 +4680,10 @@ final int pos = jj_input_stream.bufpos;
     return false;
   }
 
-  static final private boolean jj_3_3() {
+  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_40()) return true;
+    if (jj_3R_41()) 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;
@@ -4550,13 +4696,29 @@ final int pos = jj_input_stream.bufpos;
     return false;
   }
 
-  static final private boolean jj_3R_154() {
-    if (jj_scan_token(LPAREN)) return true;
+  static final private boolean jj_3R_158() {
+    if (jj_3R_163()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_41()) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_65() {
+    if (jj_scan_token(LIST)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    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_104()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    xsp = jj_scanpos;
+    if (jj_3R_105()) 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;
+    xsp = jj_scanpos;
+    if (jj_3R_106()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
@@ -4566,8 +4728,8 @@ final int pos = jj_input_stream.bufpos;
     return false;
   }
 
-  static final private boolean jj_3R_153() {
-    if (jj_3R_158()) return true;
+  static final private boolean jj_3R_157() {
+    if (jj_3R_162()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
@@ -4610,30 +4772,24 @@ final int pos = jj_input_stream.bufpos;
     return false;
   }
 
-  static final private boolean jj_3R_152() {
-    if (jj_3R_157()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_151() {
-    if (jj_3R_156()) return true;
+  static final private boolean jj_3R_156() {
+    if (jj_3R_161()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_149() {
+  static final private boolean jj_3R_154() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_150()) {
+    if (jj_3R_155()) {
     jj_scanpos = xsp;
-    if (jj_3R_151()) {
+    if (jj_3R_156()) {
     jj_scanpos = xsp;
-    if (jj_3R_152()) {
+    if (jj_3R_157()) {
     jj_scanpos = xsp;
-    if (jj_3R_153()) {
+    if (jj_3R_158()) {
     jj_scanpos = xsp;
-    if (jj_3R_154()) return true;
+    if (jj_3R_159()) 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;
@@ -4642,90 +4798,84 @@ final int pos = jj_input_stream.bufpos;
     return false;
   }
 
-  static final private boolean jj_3R_150() {
+  static final private boolean jj_3R_155() {
     if (jj_scan_token(BANG)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_130()) return true;
+    if (jj_3R_135()) 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(DECR)) return true;
+  static final private boolean jj_3R_64() {
+    if (jj_scan_token(PRINT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_155()) return true;
+    if (jj_3R_41()) 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(INCR)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_155()) return true;
+  static final private boolean jj_3R_153() {
+    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_146() {
-    if (jj_scan_token(MINUS)) return true;
+    if (jj_3R_160()) 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(PRINT)) return true;
+  static final private boolean jj_3R_152() {
+    if (jj_scan_token(INCR)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_41()) return true;
+    if (jj_3R_160()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_144() {
-    if (jj_3R_149()) return true;
+  static final private boolean jj_3R_151() {
+    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_143() {
-    if (jj_3R_148()) return true;
+  static final private boolean jj_3R_149() {
+    if (jj_3R_154()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_138() {
-    if (jj_scan_token(REM)) return true;
+  static final private boolean jj_3R_148() {
+    if (jj_3R_153()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_142() {
-    if (jj_3R_147()) return true;
+  static final private boolean jj_3R_143() {
+    if (jj_scan_token(REM)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3_7() {
-    if (jj_3R_45()) return true;
+  static final private boolean jj_3R_147() {
+    if (jj_3R_152()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_145() {
+  static final private boolean jj_3R_150() {
     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_139() {
+  static final private boolean jj_3R_144() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_141()) {
+    if (jj_3R_146()) {
     jj_scanpos = xsp;
-    if (jj_3R_142()) {
+    if (jj_3R_147()) {
     jj_scanpos = xsp;
-    if (jj_3R_143()) {
+    if (jj_3R_148()) {
     jj_scanpos = xsp;
-    if (jj_3R_144()) return true;
+    if (jj_3R_149()) 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;
@@ -4733,98 +4883,116 @@ final int pos = jj_input_stream.bufpos;
     return false;
   }
 
-  static final private boolean jj_3R_141() {
+  static final private boolean jj_3R_146() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_145()) {
+    if (jj_3R_150()) {
     jj_scanpos = xsp;
-    if (jj_3R_146()) return true;
+    if (jj_3R_151()) 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_130()) return true;
+    if (jj_3R_135()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_140() {
+  static final private boolean jj_3R_145() {
     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_135() {
+  static final private boolean jj_3R_140() {
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_140()) { jj_scanpos = xsp; break; }
+      if (jj_3R_145()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
-    if (jj_3R_139()) return true;
+    if (jj_3R_144()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_137() {
+  static final private boolean jj_3R_142() {
     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_130() {
+  static final private boolean jj_3R_135() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_134()) {
+    if (jj_3R_139()) {
     jj_scanpos = xsp;
-    if (jj_3R_135()) return true;
+    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;
     return false;
   }
 
-  static final private boolean jj_3R_134() {
+  static final private boolean jj_3R_139() {
     if (jj_scan_token(BIT_AND)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_139()) return true;
+    if (jj_3R_144()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_129() {
+  static final private boolean jj_3R_134() {
     if (jj_scan_token(RUNSIGNEDSHIFT)) 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_138() {
     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_124() {
+  static final private boolean jj_3R_129() {
     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_136() {
+  static final private boolean jj_3R_141() {
     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_131() {
+  static final private boolean jj_3R_136() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_136()) {
+    if (jj_3R_141()) {
     jj_scanpos = xsp;
-    if (jj_3R_137()) {
+    if (jj_3R_142()) {
     jj_scanpos = xsp;
-    if (jj_3R_138()) return true;
+    if (jj_3R_143()) 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_130()) return true;
+    if (jj_3R_135()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_130() {
+    if (jj_3R_135()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_136()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
+    return false;
+  }
+
+  static final private boolean jj_3R_133() {
+    if (jj_scan_token(RSIGNEDSHIFT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
@@ -4837,214 +5005,435 @@ final int pos = jj_input_stream.bufpos;
     return false;
   }
 
-  static final private boolean jj_3R_125() {
+  static final private boolean jj_3R_128() {
+    if (jj_scan_token(LE)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_137() {
+    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_131() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_137()) {
+    jj_scanpos = xsp;
+    if (jj_3R_138()) 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_130()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_193() {
+    if (jj_3R_39()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_131()) { jj_scanpos = xsp; break; }
+      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_188() {
-    if (jj_3R_39()) return true;
+  static final private boolean jj_3R_124() {
+    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_3_2()) { 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_128() {
-    if (jj_scan_token(RSIGNEDSHIFT)) return true;
+  static final private boolean jj_3R_185() {
+    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_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_123() {
-    if (jj_scan_token(LE)) return true;
+  static final private boolean jj_3R_127() {
+    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_scan_token(PLUS)) return true;
+    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_180() {
-    if (jj_scan_token(LPAREN)) return true;
+  static final private boolean jj_3R_125() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_132()) {
+    jj_scanpos = xsp;
+    if (jj_3R_133()) {
+    jj_scanpos = xsp;
+    if (jj_3R_134()) 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_124()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_195() {
+    if (jj_scan_token(ARRAYASSIGN)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_41()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_117() {
+    if (jj_3R_124()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_125()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
+    return false;
+  }
+
+  static final private boolean jj_3R_39() {
+    if (jj_3R_41()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_188()) jj_scanpos = xsp;
+    if (jj_3R_195()) 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_3R_43() {
+    if (jj_scan_token(PHPEND)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
   static final private boolean jj_3R_126() {
+    if (jj_scan_token(LT)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_118() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_132()) {
+    if (jj_3R_126()) {
     jj_scanpos = xsp;
-    if (jj_3R_133()) return true;
+    if (jj_3R_127()) {
+    jj_scanpos = xsp;
+    if (jj_3R_128()) {
+    jj_scanpos = xsp;
+    if (jj_3R_129()) 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_125()) return true;
+    } 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_117()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_119() {
-    if (jj_3R_125()) return true;
+  static final private boolean jj_3_6() {
+    if (jj_3R_44()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_115() {
+    if (jj_3R_117()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_126()) { jj_scanpos = xsp; break; }
+      if (jj_3R_118()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_190() {
-    if (jj_scan_token(ARRAYASSIGN)) return true;
+  static final private boolean jj_3R_42() {
+    if (jj_scan_token(SEMICOLON)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_41()) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_110() {
+    if (jj_3R_62()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_39() {
+  static final private boolean jj_3_5() {
     if (jj_3R_41()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_190()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_42()) {
+    jj_scanpos = xsp;
+    if (jj_3R_43()) 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_109() {
+    if (jj_scan_token(LBRACE)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_41()) 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_123() {
+    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_122() {
-    if (jj_scan_token(GT)) return true;
+    if (jj_scan_token(BANGDOUBLEEQUAL)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_127() {
-    if (jj_scan_token(LSHIFT)) return true;
+  static final private boolean jj_3R_121() {
+    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_120() {
+    if (jj_scan_token(DIF)) 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(EQ)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_116() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_127()) {
+    if (jj_3R_119()) {
     jj_scanpos = xsp;
-    if (jj_3R_128()) {
+    if (jj_3R_120()) {
     jj_scanpos = xsp;
-    if (jj_3R_129()) return true;
+    if (jj_3R_121()) {
+    jj_scanpos = xsp;
+    if (jj_3R_122()) {
+    jj_scanpos = xsp;
+    if (jj_3R_123()) 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_119()) return true;
+    } 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_115()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_112() {
-    if (jj_3R_119()) return true;
+  static final private boolean jj_3R_73() {
+    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_110()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_113() {
+    if (jj_3R_115()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_120()) { jj_scanpos = xsp; break; }
+      if (jj_3R_116()) { 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_3R_61()) return true;
+  static final private boolean jj_3R_197() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_41()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_121() {
-    if (jj_scan_token(LT)) return true;
+  static final private boolean jj_3R_72() {
+    if (jj_scan_token(DOLLAR)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_62()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_113() {
+  static final private boolean jj_3R_196() {
+    if (jj_3R_41()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_197()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
+    return false;
+  }
+
+  static final private boolean jj_3R_99() {
+    if (jj_scan_token(LBRACE)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_41()) 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_71() {
+    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_121()) {
+    if (jj_3R_109()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_70() {
+    if (jj_scan_token(LBRACE)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_41()) 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() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_70()) {
     jj_scanpos = xsp;
-    if (jj_3R_122()) {
+    if (jj_3R_71()) {
     jj_scanpos = xsp;
-    if (jj_3R_123()) {
+    if (jj_3R_72()) {
     jj_scanpos = xsp;
-    if (jj_3R_124()) return true;
+    if (jj_3R_73()) 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_112()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_104() {
-    if (jj_scan_token(LBRACE)) return true;
+  static final private boolean jj_3R_114() {
+    if (jj_scan_token(BIT_AND)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_41()) return true;
+    if (jj_3R_113()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(RBRACE)) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_194() {
+    if (jj_3R_196()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_110() {
-    if (jj_3R_112()) return true;
+  static final private boolean jj_3R_111() {
+    if (jj_3R_113()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_113()) { jj_scanpos = xsp; break; }
+      if (jj_3R_114()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_43() {
-    if (jj_scan_token(PHPEND)) return true;
+  static final private boolean jj_3R_94() {
+    if (jj_scan_token(DOLLAR)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_62()) 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_192() {
+    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_194()) 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_93() {
     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_105()) jj_scanpos = xsp;
+    if (jj_3R_99()) jj_scanpos = xsp;
     else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3_6() {
-    if (jj_3R_44()) return true;
+  static final private boolean jj_3R_77() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_93()) {
+    jj_scanpos = xsp;
+    if (jj_3R_94()) 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_112() {
+    if (jj_scan_token(XOR)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_111()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_175() {
+    if (jj_scan_token(NULL)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
@@ -5059,7 +5448,7 @@ final int pos = jj_input_stream.bufpos;
   static public boolean lookingAhead = false;
   static private boolean jj_semLA;
   static private int jj_gen;
-  static final private int[] jj_la1 = new int[116];
+  static final private int[] jj_la1 = new int[122];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static private int[] jj_la1_2;
@@ -5073,19 +5462,19 @@ final int pos = jj_input_stream.bufpos;
       jj_la1_4();
    }
    private static void jj_la1_0() {
-      jj_la1_0 = new int[] {0xfe58001e,0x0,0x6,0x6,0xfe58001e,0xfe580000,0x0,0x300000,0x300000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0xa000000,0x0,0x0,0x0,0x0,0x0,0x0,0xa000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0x2000000,0x0,0x2000000,0x0,0x0,0x0,0x0,0x2000000,0x0,0x0,0x0,0xa000000,0x0,0x0,0x0,0xa000000,0x0,0x10,0x0,0xf6400000,0x0,0x0,0x0,0x0,0xe0000000,0x0,0x0,0x0,0x0,0x0,0x0,0xfe580000,0xfe580000,0x0,0x0,0x0,0x0,0x2000000,0x0,0xfe580000,0x0,0xfe400000,0x800000,0x1000000,0x800000,0x1000000,0xfe400000,0xfe400000,0xfe400000,0xfe400000,0x0,0xfe400000,0x0,0x0,0x0,0x2000000,0xa000000,0x2000000,0xfe400000,0xfe400000,0x2000000,0x0,0x0,0x0,0xa000000,};
+      jj_la1_0 = new int[] {0xfcb0001e,0x0,0x6,0x6,0xfcb0001e,0xfcb00000,0x0,0x600000,0x600000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x0,0x14000000,0x0,0x0,0x0,0x0,0x0,0x0,0x14000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x0,0x4000000,0x0,0x4000000,0x0,0x0,0x0,0x0,0x4000000,0x0,0x0,0x0,0x14000000,0x0,0x0,0x0,0x14000000,0x0,0x10,0x0,0xe4800000,0xfc800000,0x0,0x0,0x0,0x0,0xc0000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfcb00000,0xfcb00000,0xf4b00000,0x0,0x0,0x0,0x0,0x4000000,0x0,0xf4b00000,0x8000000,0x0,0xfc800000,0x1000000,0x2000000,0x1000000,0x2000000,0xfc800000,0xfc800000,0xfc800000,0xfc800000,0x0,0xfc800000,0x0,0x0,0x0,0x4000000,0x14000000,0x4000000,0xfc800000,0xfc800000,0x4000000,0x0,0x0,0x0,0x14000000,};
    }
    private static void jj_la1_1() {
-      jj_la1_1 = new int[] {0x475d507,0x0,0x0,0x0,0x475d507,0x475d507,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x308000,0x20,0x30c000,0x0,0x0,0x0,0x0,0xf0000000,0x0,0x30c000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x30c000,0x0,0x30c000,0x0,0x30c000,0x0,0x0,0x8,0x8,0x4000,0x4000,0x0,0x8,0x30c000,0x8,0x308000,0x300000,0x30c000,0x0,0x0,0x0,0x4455507,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x475d507,0x475d507,0x0,0x0,0x0,0x0,0x4000,0x240,0x475d507,0x240,0x475d507,0x0,0x0,0x0,0x0,0x475d507,0x475d507,0x475d507,0x475d507,0x0,0x475d507,0x0,0x8,0x20,0x4000,0x30c000,0x4000,0x475d507,0x475d507,0x4000,0x0,0x0,0x0,0x30c000,};
+      jj_la1_1 = new int[] {0x11d7548f,0x0,0x0,0x0,0x11d7548f,0x11d7548f,0x2000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc20000,0x40,0xc30080,0x0,0x0,0x0,0x0,0xc0000000,0x0,0xc30080,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc30000,0x0,0xc30000,0x0,0xc30000,0x0,0x0,0x10,0x10,0x10000,0x10000,0x0,0x10,0xc30080,0x10,0xc20000,0xc00000,0xc30080,0x0,0x0,0x0,0x1115540f,0x11d7548f,0x0,0x0,0x0,0x0,0x3,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x11d7548f,0x11d7548f,0x11d7548f,0x0,0x0,0x0,0x0,0x10000,0x900,0x11d7548f,0x0,0x900,0x11d7548f,0x0,0x0,0x0,0x0,0x11d7548f,0x11d7548f,0x11d7548f,0x11d7548f,0x0,0x11d7548f,0x0,0x10,0x40,0x10000,0xc30080,0x10000,0x11d7548f,0x11d7548f,0x10000,0x0,0x0,0x0,0xc30080,};
    }
    private static void jj_la1_2() {
-      jj_la1_2 = new int[] {0x8a22880,0x8000000,0x0,0x0,0x8a22880,0x8a22880,0x0,0x0,0x0,0x10000000,0x0,0x800000,0x0,0x800000,0x820000,0x820000,0x880,0x880,0x22880,0x0,0x222880,0x0,0x10000000,0x0,0x0,0x1f,0x0,0x222880,0x0,0x0,0x20,0x20,0x40,0x40,0x20000000,0x0,0x0,0x0,0x0,0x0,0xc0000000,0xc0000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x222880,0x0,0x222880,0x0,0x222880,0x0,0x0,0x2200000,0x2200000,0x20000,0x20000,0x20000,0x2200000,0x222880,0x2000000,0x2880,0x0,0x222880,0x10000000,0x8000000,0x0,0x8820000,0x8000000,0x8000000,0x8000000,0x8000000,0x0,0x10000000,0x8000000,0x10000000,0x8000000,0x10000000,0x8000000,0x8a22880,0x8a22880,0x10000000,0x0,0x0,0x0,0x20000,0x0,0x8a22880,0x0,0x8a22880,0x0,0x0,0x0,0x0,0x8a22880,0x8a22880,0x8a22880,0x8a22880,0x8000000,0x8a22880,0x8000000,0x2000000,0x0,0x20000,0x222880,0x20000,0x8a22880,0x8a22880,0x20000,0x10000000,0x20000,0x20000,0x222880,};
+      jj_la1_2 = new int[] {0x2288a200,0x20000000,0x0,0x0,0x2288a200,0x2288a200,0x0,0x0,0x0,0x40000000,0x0,0x2000000,0x0,0x2000000,0x2080000,0x2080000,0x2200,0x2200,0x8a200,0x0,0x88a200,0x0,0x40000000,0x0,0x0,0x7f,0x0,0x88a200,0x0,0x0,0x80,0x80,0x100,0x100,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x88a200,0x0,0x88a200,0x0,0x88a200,0x0,0x0,0x8800000,0x8800000,0x80000,0x80000,0x80000,0x8800000,0x88a200,0x8000000,0xa200,0x0,0x88a200,0x40000000,0x20000000,0x0,0x22080000,0x2288a200,0x20000000,0x20000000,0x20000000,0x20000000,0x0,0x0,0x40000000,0x0,0x40000000,0x20000000,0x40000000,0x20000000,0x40000000,0x20000000,0x2288a200,0x2288a200,0x2288a200,0x40000000,0x0,0x0,0x0,0x80000,0x0,0x2288a200,0x0,0x0,0x2288a200,0x0,0x0,0x0,0x0,0x2288a200,0x2288a200,0x2288a200,0x2288a200,0x20000000,0x2288a200,0x20000000,0x8000000,0x0,0x80000,0x88a200,0x80000,0x2288a200,0x2288a200,0x80000,0x40000000,0x80000,0x80000,0x88a200,};
    }
    private static void jj_la1_3() {
-      jj_la1_3 = new int[] {0x9e1c0000,0x0,0x0,0x0,0x9e1c0000,0x9e1c0000,0x0,0x0,0x0,0x0,0x80,0x0,0x80000,0x0,0x80000,0x80000,0x0,0x0,0x18000000,0x0,0x9e1c0000,0x80000000,0x0,0x80080000,0x80000000,0x0,0x3ff80,0x9e1c0000,0x3ff80,0x200000,0x800000,0x800000,0x1000000,0x1000000,0x0,0x0,0x0,0x80000000,0x79,0x79,0x6,0x6,0x0,0x0,0x18000000,0x18000000,0x60000000,0x60000000,0x40000,0x9e1c0000,0x18000000,0x1e180000,0x100000,0x80000,0x6000000,0x6000000,0x0,0x0,0x80000,0x80000,0x80000,0x0,0x9e1c0000,0x0,0x0,0x0,0x9e1c0000,0x0,0x0,0x40000,0x60c0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x9e1c0000,0x9e1c0000,0x0,0x80,0x603ff80,0x603ff80,0x6080000,0x0,0x9e1c0000,0x0,0x9e1c0000,0x0,0x0,0x0,0x0,0x9e5c0000,0x9e1c0000,0x9e1c0000,0x9e1c0000,0x0,0x9e5c0000,0x0,0x0,0x0,0x6080000,0x9e1c0000,0x6080000,0x9e1c0000,0x9e5c0000,0x6080000,0x0,0x0,0x0,0x9e1c0000,};
+      jj_la1_3 = new int[] {0x78700000,0x0,0x0,0x0,0x78700000,0x78700000,0x0,0x0,0x0,0x0,0x200,0x0,0x200000,0x0,0x200000,0x200000,0x0,0x0,0x60000000,0x0,0x78700000,0x0,0x0,0x200000,0x0,0x0,0xffe00,0x78700000,0xffe00,0x800000,0x2000000,0x2000000,0x4000000,0x4000000,0x0,0x0,0x0,0x0,0x1e4,0x1e4,0x1b,0x1b,0x0,0x0,0x60000000,0x60000000,0x80000000,0x80000000,0x100000,0x78700000,0x60000000,0x78600000,0x400000,0x200000,0x18000000,0x18000000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x78700000,0x0,0x0,0x0,0x78700000,0x0,0x0,0x100000,0x18300000,0x78700000,0x0,0x0,0x0,0x0,0x0,0x200000,0x0,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x78700000,0x78700000,0x78700000,0x0,0x200,0x180ffe00,0x180ffe00,0x18200000,0x0,0x78700000,0x0,0x0,0x78700000,0x0,0x0,0x0,0x0,0x79700000,0x78700000,0x78700000,0x78700000,0x0,0x79700000,0x0,0x0,0x0,0x18200000,0x78700000,0x18200000,0x78700000,0x79700000,0x18200000,0x0,0x0,0x0,0x78700000,};
    }
    private static void jj_la1_4() {
-      jj_la1_4 = new int[] {0x100,0x0,0x0,0x0,0x100,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x100,0x100,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0xc0,0x100,0xc0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x2,0x0,0x0,0x0,0x0,0x0,0x38,0x38,0x0,0x0,0x4,0x4,0x0,0x100,0x0,0x100,0x0,0x100,0x0,0x0,0x0,0x0,0x100,0x100,0x100,0x0,0x100,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x100,0x200,0x200,0x200,0x200,0x0,0x0,0x200,0x0,0x200,0x0,0x200,0x100,0x100,0x0,0x0,0xc0,0xc0,0x100,0x0,0x100,0x0,0x100,0x0,0x0,0x0,0x0,0x100,0x100,0x100,0x100,0x200,0x100,0x200,0x0,0x0,0x100,0x100,0x100,0x100,0x100,0x100,0x0,0x0,0x0,0x100,};
+      jj_la1_4 = new int[] {0x402,0x0,0x0,0x0,0x402,0x402,0x0,0x0,0x0,0x0,0x0,0x0,0x400,0x0,0x400,0x400,0x0,0x0,0x0,0x0,0x402,0x2,0x0,0x402,0x2,0x0,0x300,0x402,0x300,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x8,0x2,0x0,0x0,0x0,0x0,0xe0,0xe0,0x0,0x0,0x11,0x11,0x0,0x402,0x0,0x400,0x0,0x400,0x0,0x0,0x0,0x0,0x400,0x400,0x400,0x0,0x402,0x0,0x0,0x0,0x402,0x0,0x0,0x0,0x400,0x402,0x800,0x800,0x800,0x800,0x0,0x400,0x0,0x0,0x0,0x800,0x0,0x800,0x0,0x800,0x402,0x402,0x402,0x0,0x0,0x300,0x300,0x400,0x0,0x402,0x0,0x0,0x402,0x0,0x0,0x0,0x0,0x402,0x402,0x402,0x402,0x800,0x402,0x800,0x0,0x0,0x400,0x402,0x400,0x402,0x402,0x400,0x0,0x0,0x0,0x402,};
    }
   static final private JJCalls[] jj_2_rtns = new JJCalls[7];
   static private boolean jj_rescan = false;
@@ -5104,7 +5493,7 @@ final int pos = jj_input_stream.bufpos;
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 116; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 122; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -5114,7 +5503,7 @@ final int pos = jj_input_stream.bufpos;
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 116; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 122; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -5131,7 +5520,7 @@ final int pos = jj_input_stream.bufpos;
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 116; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 122; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -5141,7 +5530,7 @@ final int pos = jj_input_stream.bufpos;
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 116; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 122; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -5157,7 +5546,7 @@ final int pos = jj_input_stream.bufpos;
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 116; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 122; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -5166,7 +5555,7 @@ final int pos = jj_input_stream.bufpos;
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 116; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 122; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -5273,15 +5662,15 @@ final int pos = jj_input_stream.bufpos;
 
   static public ParseException generateParseException() {
     jj_expentries.removeAllElements();
-    boolean[] la1tokens = new boolean[138];
-    for (int i = 0; i < 138; i++) {
+    boolean[] la1tokens = new boolean[140];
+    for (int i = 0; i < 140; i++) {
       la1tokens[i] = false;
     }
     if (jj_kind >= 0) {
       la1tokens[jj_kind] = true;
       jj_kind = -1;
     }
-    for (int i = 0; i < 116; i++) {
+    for (int i = 0; i < 122; i++) {
       if (jj_la1[i] == jj_gen) {
         for (int j = 0; j < 32; j++) {
           if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -5302,7 +5691,7 @@ final int pos = jj_input_stream.bufpos;
         }
       }
     }
-    for (int i = 0; i < 138; i++) {
+    for (int i = 0; i < 140; i++) {
       if (la1tokens[i]) {
         jj_expentry = new int[1];
         jj_expentry[0] = i;