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

diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.java b/net.sourceforge.phpeclipse/src/test/PHPParser.java
index 261d359..8f6e050 100644
--- a/net.sourceforge.phpeclipse/src/test/PHPParser.java
+++ b/net.sourceforge.phpeclipse/src/test/PHPParser.java
@@ -8,7 +8,6 @@ import org.eclipse.ui.texteditor.MarkerUtilities;
 import org.eclipse.jface.preference.IPreferenceStore;
 
 import java.util.Hashtable;
-import java.util.Enumeration;
 import java.util.ArrayList;
 import java.io.StringReader;
 import java.io.*;
@@ -18,6 +17,7 @@ import net.sourceforge.phpeclipse.actions.PHPStartApacheAction;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 import net.sourceforge.phpdt.internal.compiler.ast.*;
 import net.sourceforge.phpdt.internal.compiler.parser.OutlineableWithChildren;
+import net.sourceforge.phpdt.internal.compiler.parser.Outlineable;
 import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo;
 
 /**
@@ -39,8 +39,6 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
   private static final String PARSE_WARNING_STRING = "Warning"; //$NON-NLS-1$
   static PHPOutlineInfo outlineInfo;
 
-  private static boolean assigning;
-
   /** 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 */
@@ -49,6 +47,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
   private static int errorStart = -1;
   private static int errorEnd = -1;
   private static PHPDocument phpDocument;
+
+  private static final char[] SYNTAX_ERROR_CHAR = {'s','y','n','t','a','x',' ','e','r','r','o','r'};
   /**
    * The point where html starts.
    * It will be used by the token manager to create HTMLCode objects
@@ -101,7 +101,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
   }
 
   public final PHPOutlineInfo parseInfo(final Object parent, final String s) {
-    currentSegment = new PHPDocument(parent);
+    phpDocument = new PHPDocument(parent,"_root".toCharArray());
+    currentSegment = phpDocument;
     outlineInfo = new PHPOutlineInfo(parent, currentSegment);
     final StringReader stream = new StringReader(s);
     if (jj_input_stream == null) {
@@ -111,9 +112,11 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
     init();
     try {
       parse();
-      phpDocument = new PHPDocument(null);
       phpDocument.nodes = new AstNode[nodes.length];
       System.arraycopy(nodes,0,phpDocument.nodes,0,nodes.length);
+      if (PHPeclipsePlugin.DEBUG) {
+        PHPeclipsePlugin.log(1,phpDocument.toString());
+      }
     } catch (ParseException e) {
       processParseException(e);
     }
@@ -145,8 +148,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
       if (errorStart == -1) {
         setMarker(fileToParse,
                   errorMessage,
-                  jj_input_stream.tokenBegin,
-                  jj_input_stream.tokenBegin + e.currentToken.image.length(),
+                  SimpleCharStream.tokenBegin,
+                  SimpleCharStream.tokenBegin + e.currentToken.image.length(),
                   errorLevel,
                   "Line " + e.currentToken.beginLine);
       } else {
@@ -164,31 +167,6 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
     }
   }
 
-  /**
-   * Create markers according to the external parser output
-   */
-  private static void createMarkers(final String output, final IFile file) throws CoreException {
-    // delete all markers
-    file.deleteMarkers(IMarker.PROBLEM, false, 0);
-
-    int indx = 0;
-    int brIndx;
-    boolean flag = true;
-    while ((brIndx = output.indexOf("<br />", indx)) != -1) {
-      // newer php error output (tested with 4.2.3)
-      scanLine(output, file, indx, brIndx);
-      indx = brIndx + 6;
-      flag = false;
-    }
-    if (flag) {
-      while ((brIndx = output.indexOf("<br>", indx)) != -1) {
-        // older php error output (tested with 4.2.3)
-        scanLine(output, file, indx, brIndx);
-        indx = brIndx + 4;
-      }
-    }
-  }
-
   private static void scanLine(final String output,
                                final IFile file,
                                final int indx,
@@ -278,6 +256,25 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
     pushOnAstNodes(new HTMLCode(chars, htmlStart,currentPosition));
   }
 
+  /**
+   * Create a new task.
+   */
+  public static final void createNewTask() {
+    final int currentPosition = SimpleCharStream.getPosition();
+    final String  todo = SimpleCharStream.currentBuffer.substring(currentPosition+1,
+                                                                  SimpleCharStream.currentBuffer.indexOf("\n",
+                                                                                                         currentPosition)-1);
+    try {
+      setMarker(fileToParse,
+                "todo : " + todo,
+                SimpleCharStream.getBeginLine(),
+                TASK,
+                "Line "+SimpleCharStream.getBeginLine());
+    } catch (CoreException e) {
+      PHPeclipsePlugin.log(e);
+    }
+  }
+
   private static final void parse() throws ParseException {
           phpFile();
   }
@@ -304,6 +301,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
         case INCLUDE_ONCE:
         case REQUIRE_ONCE:
         case GLOBAL:
+        case DEFINE:
         case STATIC:
         case CONTINUE:
         case DO:
@@ -319,8 +317,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
         case AT:
         case DOLLAR:
         case BANG:
-        case INCR:
-        case DECR:
+        case PLUS_PLUS:
+        case MINUS_MINUS:
         case PLUS:
         case MINUS:
         case BIT_AND:
@@ -340,7 +338,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
         }
         PhpBlock();
       }
-      jj_consume_token(0);
+     PHPParser.createNewHTMLCode();
     } catch (TokenMgrError e) {
     PHPeclipsePlugin.log(e);
     errorStart   = SimpleCharStream.getPosition();
@@ -358,9 +356,11 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
  */
   static final public void PhpBlock() throws ParseException {
   final int start = SimpleCharStream.getPosition();
+  final PHPEchoBlock phpEchoBlock;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case PHPECHOSTART:
-      phpEchoBlock();
+      phpEchoBlock = phpEchoBlock();
+   pushOnAstNodes(phpEchoBlock);
       break;
     case PHPSTARTSHORT:
     case PHPSTARTLONG:
@@ -378,6 +378,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
     case INCLUDE_ONCE:
     case REQUIRE_ONCE:
     case GLOBAL:
+    case DEFINE:
     case STATIC:
     case CONTINUE:
     case DO:
@@ -393,8 +394,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
     case AT:
     case DOLLAR:
     case BANG:
-    case INCR:
-    case DECR:
+    case PLUS_PLUS:
+    case MINUS_MINUS:
     case PLUS:
     case MINUS:
     case BIT_AND:
@@ -444,7 +445,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
     errorLevel   = ERROR;
     errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd   = SimpleCharStream.getPosition() + 1;
-    {if (true) throw e;}
+    processParseException(e);
       }
       break;
     default:
@@ -492,6 +493,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
       case INCLUDE_ONCE:
       case REQUIRE_ONCE:
       case GLOBAL:
+      case DEFINE:
       case STATIC:
       case CONTINUE:
       case DO:
@@ -507,8 +509,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
       case AT:
       case DOLLAR:
       case BANG:
-      case INCR:
-      case DECR:
+      case PLUS_PLUS:
+      case MINUS_MINUS:
       case PLUS:
       case MINUS:
       case BIT_AND:
@@ -535,43 +537,48 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
   final Token className;
   Token superclassName = null;
   final int pos;
+  char[] classNameImage = SYNTAX_ERROR_CHAR;
+  char[] superclassNameImage = null;
     jj_consume_token(CLASS);
+   pos = SimpleCharStream.getPosition();
     try {
-     pos = SimpleCharStream.getPosition();
       className = jj_consume_token(IDENTIFIER);
+     classNameImage = className.image.toCharArray();
     } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected";
     errorLevel   = ERROR;
     errorStart   = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd     = SimpleCharStream.getPosition() + 1;
-    {if (true) throw e;}
+    processParseException(e);
     }
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case EXTENDS:
       jj_consume_token(EXTENDS);
       try {
         superclassName = jj_consume_token(IDENTIFIER);
+       superclassNameImage = superclassName.image.toCharArray();
       } catch (ParseException e) {
       errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected";
       errorLevel   = ERROR;
       errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
       errorEnd   = SimpleCharStream.getPosition() + 1;
-      {if (true) throw e;}
+      processParseException(e);
+      superclassNameImage = SYNTAX_ERROR_CHAR;
       }
       break;
     default:
       jj_la1[6] = jj_gen;
       ;
     }
-    if (superclassName == null) {
+    if (superclassNameImage == null) {
       classDeclaration = new ClassDeclaration(currentSegment,
-                                              className.image.toCharArray(),
+                                              classNameImage,
                                               pos,
                                               0);
     } else {
       classDeclaration = new ClassDeclaration(currentSegment,
-                                              className.image.toCharArray(),
-                                              superclassName.image.toCharArray(),
+                                              classNameImage,
+                                              superclassNameImage,
                                               pos,
                                               0);
     }
@@ -628,12 +635,11 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case FUNCTION:
       method = MethodDeclaration();
-                                method.setParent(classDeclaration);
                                 classDeclaration.addMethod(method);
       break;
     case VAR:
       field = FieldDeclaration();
-                                classDeclaration.addVariable(field);
+                                classDeclaration.addField(field);
       break;
     default:
       jj_la1[8] = jj_gen;
@@ -654,7 +660,6 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
     variableDeclaration = VariableDeclarator();
    arrayList.add(variableDeclaration);
    outlineInfo.addVariable(new String(variableDeclaration.name));
-   currentSegment.add(variableDeclaration);
     label_4:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -669,7 +674,6 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
       variableDeclaration = VariableDeclarator();
        arrayList.add(variableDeclaration);
        outlineInfo.addVariable(new String(variableDeclaration.name));
-       currentSegment.add(variableDeclaration);
     }
     try {
       jj_consume_token(SEMICOLON);
@@ -678,7 +682,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
     errorLevel   = ERROR;
     errorStart   = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd     = SimpleCharStream.getPosition() + 1;
-    {if (true) throw e;}
+    processParseException(e);
     }
    list = new VariableDeclaration[arrayList.size()];
    arrayList.toArray(list);
@@ -730,13 +734,12 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
  */
   static final public String VariableDeclaratorId() throws ParseException {
   String expr;
-  Expression expression;
+  Expression expression = null;
   final StringBuffer buff = new StringBuffer();
   final int pos = SimpleCharStream.getPosition();
   ConstantIdentifier ex;
     try {
       expr = Variable();
-                         buff.append(expr);
       label_5:
       while (true) {
         if (jj_2_1(2)) {
@@ -748,9 +751,11 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
                                    pos,
                                    SimpleCharStream.getPosition());
         expression = VariableSuffix(ex);
-       buff.append(expression.toStringExpression());
       }
-     {if (true) return buff.toString();}
+     if (expression == null) {
+       {if (true) return expr;}
+     }
+     {if (true) return expression.toStringExpression();}
     } catch (ParseException e) {
     errorMessage = "'$' expected for variable identifier";
     errorLevel   = ERROR;
@@ -761,6 +766,10 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
     throw new Error("Missing return statement in function");
   }
 
+/**
+ * Return a variablename without the $.
+ * @return a variable name
+ */
   static final public String Variable() throws ParseException {
   final StringBuffer buff;
   Expression expression = null;
@@ -779,13 +788,13 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
         jj_la1[11] = jj_gen;
         ;
       }
-    if (expression == null && !assigning) {
+    if (expression == null) {
       {if (true) return token.image.substring(1);}
     }
     buff = new StringBuffer(token.image);
-    buff.append('{');
+    buff.append("{");
     buff.append(expression.toStringExpression());
-    buff.append('}');
+    buff.append("}");
     {if (true) return buff.toString();}
       break;
     case DOLLAR:
@@ -801,6 +810,10 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
     throw new Error("Missing return statement in function");
   }
 
+/**
+ * A Variable name (without the $)
+ * @return a variable name String
+ */
   static final public String VariableName() throws ParseException {
   final StringBuffer buff;
   String expr = null;
@@ -832,15 +845,15 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
       {if (true) return token.image;}
     }
     buff = new StringBuffer(token.image);
-    buff.append('{');
+    buff.append("{");
     buff.append(expression.toStringExpression());
-    buff.append('}');
+    buff.append("}");
     {if (true) return buff.toString();}
       break;
     case DOLLAR:
       jj_consume_token(DOLLAR);
       expr = VariableName();
-    buff = new StringBuffer('$');
+    buff = new StringBuffer("$");
     buff.append(expr);
     {if (true) return buff.toString();}
       break;
@@ -958,8 +971,8 @@ Expression expr,expr2;
     case AT:
     case DOLLAR:
     case BANG:
-    case INCR:
-    case DECR:
+    case PLUS_PLUS:
+    case MINUS_MINUS:
     case PLUS:
     case MINUS:
     case BIT_AND:
@@ -1010,6 +1023,7 @@ Expression expr,expr2;
   static final public MethodDeclaration MethodDeclaration() throws ParseException {
   final MethodDeclaration functionDeclaration;
   final Block block;
+  final OutlineableWithChildren seg = currentSegment;
     jj_consume_token(FUNCTION);
     try {
       functionDeclaration = MethodDeclarator();
@@ -1022,16 +1036,11 @@ Expression expr,expr2;
     errorEnd   = SimpleCharStream.getPosition() + 1;
     {if (true) throw e;}
     }
-    if (currentSegment != null) {
-      currentSegment.add(functionDeclaration);
-      currentSegment = functionDeclaration;
-    }
+   currentSegment = functionDeclaration;
     block = Block();
-    functionDeclaration.statements = block.statements;
-    if (currentSegment != null) {
-      currentSegment = (OutlineableWithChildren) currentSegment.getParent();
-    }
-    {if (true) return functionDeclaration;}
+   functionDeclaration.statements = block.statements;
+   currentSegment = seg;
+   {if (true) return functionDeclaration;}
     throw new Error("Missing return statement in function");
   }
 
@@ -1045,6 +1054,7 @@ Expression expr,expr2;
   Token reference = null;
   final Hashtable formalParameters;
   final int pos = SimpleCharStream.getPosition();
+  char[] identifierChar = SYNTAX_ERROR_CHAR;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case BIT_AND:
       reference = jj_consume_token(BIT_AND);
@@ -1053,14 +1063,23 @@ Expression expr,expr2;
       jj_la1[21] = jj_gen;
       ;
     }
-    identifier = jj_consume_token(IDENTIFIER);
+    try {
+      identifier = jj_consume_token(IDENTIFIER);
+     identifierChar = identifier.image.toCharArray();
+    } catch (ParseException e) {
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function identifier expected";
+    errorLevel   = ERROR;
+    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+    errorEnd   = SimpleCharStream.getPosition() + 1;
+    processParseException(e);
+    }
     formalParameters = FormalParameters();
    {if (true) return new MethodDeclaration(currentSegment,
-                                 identifier.image.toCharArray(),
-                                 formalParameters,
-                                 reference != null,
-                                 pos,
-                                 SimpleCharStream.getPosition());}
+                                identifierChar,
+                                formalParameters,
+                                reference != null,
+                                pos,
+                                SimpleCharStream.getPosition());}
     throw new Error("Missing return statement in function");
   }
 
@@ -1078,7 +1097,7 @@ Expression expr,expr2;
     errorLevel   = ERROR;
     errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd   = SimpleCharStream.getPosition() + 1;
-    {if (true) throw e;}
+    processParseException(e);
     }
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case DOLLAR:
@@ -1112,7 +1131,7 @@ Expression expr,expr2;
     errorLevel   = ERROR;
     errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd   = SimpleCharStream.getPosition() + 1;
-    {if (true) throw e;}
+    processParseException(e);
     }
   {if (true) return parameters;}
     throw new Error("Missing return statement in function");
@@ -1147,56 +1166,47 @@ Expression expr,expr2;
     case STRING:
       jj_consume_token(STRING);
                         pos = SimpleCharStream.getPosition();
-                        {if (true) return new ConstantIdentifier(Types.STRING,
-                                                      pos,pos-6);}
+                        {if (true) return new ConstantIdentifier(Types.STRING,pos,pos-6);}
       break;
     case BOOL:
       jj_consume_token(BOOL);
                         pos = SimpleCharStream.getPosition();
-                        {if (true) return new ConstantIdentifier(Types.BOOL,
-                                                      pos,pos-4);}
+                        {if (true) return new ConstantIdentifier(Types.BOOL,pos,pos-4);}
       break;
     case BOOLEAN:
       jj_consume_token(BOOLEAN);
                         pos = SimpleCharStream.getPosition();
-                        {if (true) return new ConstantIdentifier(Types.BOOLEAN,
-                                                      pos,pos-7);}
+                        {if (true) return new ConstantIdentifier(Types.BOOLEAN,pos,pos-7);}
       break;
     case REAL:
       jj_consume_token(REAL);
                         pos = SimpleCharStream.getPosition();
-                        {if (true) return new ConstantIdentifier(Types.REAL,
-                                                      pos,pos-4);}
+                        {if (true) return new ConstantIdentifier(Types.REAL,pos,pos-4);}
       break;
     case DOUBLE:
       jj_consume_token(DOUBLE);
                         pos = SimpleCharStream.getPosition();
-                        {if (true) return new ConstantIdentifier(Types.DOUBLE,
-                                                      pos,pos-5);}
+                        {if (true) return new ConstantIdentifier(Types.DOUBLE,pos,pos-5);}
       break;
     case FLOAT:
       jj_consume_token(FLOAT);
                         pos = SimpleCharStream.getPosition();
-                        {if (true) return new ConstantIdentifier(Types.FLOAT,
-                                                      pos,pos-5);}
+                        {if (true) return new ConstantIdentifier(Types.FLOAT,pos,pos-5);}
       break;
     case INT:
       jj_consume_token(INT);
                         pos = SimpleCharStream.getPosition();
-                        {if (true) return new ConstantIdentifier(Types.INT,
-                                                      pos,pos-3);}
+                        {if (true) return new ConstantIdentifier(Types.INT,pos,pos-3);}
       break;
     case INTEGER:
       jj_consume_token(INTEGER);
                         pos = SimpleCharStream.getPosition();
-                        {if (true) return new ConstantIdentifier(Types.INTEGER,
-                                                      pos,pos-7);}
+                        {if (true) return new ConstantIdentifier(Types.INTEGER,pos,pos-7);}
       break;
     case OBJECT:
       jj_consume_token(OBJECT);
                         pos = SimpleCharStream.getPosition();
-                        {if (true) return new ConstantIdentifier(Types.OBJECT,
-                                                      pos,pos-6);}
+                        {if (true) return new ConstantIdentifier(Types.OBJECT,pos,pos-6);}
       break;
     default:
       jj_la1[25] = jj_gen;
@@ -1232,8 +1242,8 @@ Expression expr,expr2;
         case AT:
         case DOLLAR:
         case BANG:
-        case INCR:
-        case DECR:
+        case PLUS_PLUS:
+        case MINUS_MINUS:
         case PLUS:
         case MINUS:
         case BIT_AND:
@@ -1262,13 +1272,13 @@ Expression expr,expr2;
  */
   static final public VarAssignation varAssignation() throws ParseException {
   String varName;
-  final Expression expression;
+  final Expression initializer;
   final int assignOperator;
   final int pos = SimpleCharStream.getPosition();
     varName = VariableDeclaratorId();
     assignOperator = AssignmentOperator();
     try {
-      expression = Expression();
+      initializer = Expression();
     } catch (ParseException e) {
       if (errorMessage != null) {
         {if (true) throw e;}
@@ -1280,7 +1290,7 @@ Expression expr,expr2;
       {if (true) throw e;}
     }
      {if (true) return new VarAssignation(varName.toCharArray(),
-                               expression,
+                               initializer,
                                assignOperator,
                                pos,
                                SimpleCharStream.getPosition());}
@@ -1783,8 +1793,8 @@ Expression expr,expr2;
     case AT:
     case DOLLAR:
     case BANG:
-    case INCR:
-    case DECR:
+    case PLUS_PLUS:
+    case MINUS_MINUS:
     case PLUS:
     case MINUS:
     case INTEGER_LITERAL:
@@ -1820,8 +1830,8 @@ Expression expr,expr2;
     case FALSE:
     case DOLLAR:
     case BANG:
-    case INCR:
-    case DECR:
+    case PLUS_PLUS:
+    case MINUS_MINUS:
     case PLUS:
     case MINUS:
     case INTEGER_LITERAL:
@@ -1865,8 +1875,8 @@ Expression expr,expr2;
       expr = UnaryExpression();
    {if (true) return new PrefixedUnaryExpression(expr,operator,pos);}
       break;
-    case INCR:
-    case DECR:
+    case PLUS_PLUS:
+    case MINUS_MINUS:
       expr = PreIncDecExpression();
    {if (true) return expr;}
       break;
@@ -1899,13 +1909,13 @@ final Expression expr;
 final int operator;
   final int pos = SimpleCharStream.getPosition();
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case INCR:
-      jj_consume_token(INCR);
-             operator = OperatorIds.PLUS_PLUS;
+    case PLUS_PLUS:
+      jj_consume_token(PLUS_PLUS);
+                  operator = OperatorIds.PLUS_PLUS;
       break;
-    case DECR:
-      jj_consume_token(DECR);
-             operator = OperatorIds.MINUS_MINUS;
+    case MINUS_MINUS:
+      jj_consume_token(MINUS_MINUS);
+                    operator = OperatorIds.MINUS_MINUS;
       break;
     default:
       jj_la1[52] = jj_gen;
@@ -2012,16 +2022,16 @@ final int pos = SimpleCharStream.getPosition();
   final int pos = SimpleCharStream.getPosition();
     expr = PrimaryExpression();
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case INCR:
-    case DECR:
+    case PLUS_PLUS:
+    case MINUS_MINUS:
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case INCR:
-        jj_consume_token(INCR);
-            operator = OperatorIds.PLUS_PLUS;
+      case PLUS_PLUS:
+        jj_consume_token(PLUS_PLUS);
+                 operator = OperatorIds.PLUS_PLUS;
         break;
-      case DECR:
-        jj_consume_token(DECR);
-            operator = OperatorIds.MINUS_MINUS;
+      case MINUS_MINUS:
+        jj_consume_token(MINUS_MINUS);
+                   operator = OperatorIds.MINUS_MINUS;
         break;
       default:
         jj_la1[56] = jj_gen;
@@ -2044,7 +2054,7 @@ final int pos = SimpleCharStream.getPosition();
   final Token identifier;
   Expression expr;
   final int pos = SimpleCharStream.getPosition();
-    if (jj_2_5(2)) {
+    if (jj_2_7(2)) {
       identifier = jj_consume_token(IDENTIFIER);
       jj_consume_token(STATICCLASSACCESS);
       expr = ClassIdentifier();
@@ -2055,14 +2065,9 @@ final int pos = SimpleCharStream.getPosition();
                           ClassAccess.STATIC);
       label_19:
       while (true) {
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-        case CLASSACCESS:
-        case LPAREN:
-        case LBRACKET:
+        if (jj_2_5(2147483647)) {
           ;
-          break;
-        default:
-          jj_la1[58] = jj_gen;
+        } else {
           break label_19;
         }
         expr = PrimarySuffix(expr);
@@ -2077,14 +2082,9 @@ final int pos = SimpleCharStream.getPosition();
         expr = PrimaryPrefix();
         label_20:
         while (true) {
-          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-          case CLASSACCESS:
-          case LPAREN:
-          case LBRACKET:
+          if (jj_2_6(2147483647)) {
             ;
-            break;
-          default:
-            jj_la1[59] = jj_gen;
+          } else {
             break label_20;
           }
           expr = PrimarySuffix(expr);
@@ -2096,7 +2096,7 @@ final int pos = SimpleCharStream.getPosition();
    {if (true) return expr;}
         break;
       default:
-        jj_la1[60] = jj_gen;
+        jj_la1[58] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2104,6 +2104,11 @@ final int pos = SimpleCharStream.getPosition();
     throw new Error("Missing return statement in function");
   }
 
+/**
+ * An array declarator.
+ * array(vars)
+ * @return an array
+ */
   static final public ArrayInitializer ArrayDeclarator() throws ParseException {
   final ArrayVariableDeclaration[] vars;
   final int pos = SimpleCharStream.getPosition();
@@ -2135,12 +2140,13 @@ final int pos = SimpleCharStream.getPosition();
     case DOLLAR:
     case DOLLAR_ID:
       var = VariableDeclaratorId();
-                                 {if (true) return new ConstantIdentifier(var.toCharArray(),
-                                                               pos,
-                                                               SimpleCharStream.getPosition());}
+                                 {if (true) return new VariableDeclaration(currentSegment,
+                                                                var.toCharArray(),
+                                                                pos,
+                                                                SimpleCharStream.getPosition());}
       break;
     default:
-      jj_la1[61] = jj_gen;
+      jj_la1[59] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2167,7 +2173,7 @@ final int pos = SimpleCharStream.getPosition();
                                   SimpleCharStream.getPosition());
       break;
     default:
-      jj_la1[62] = jj_gen;
+      jj_la1[60] = jj_gen;
       ;
     }
    {if (true) return new PrefixedUnaryExpression(expr,
@@ -2195,7 +2201,7 @@ final int pos = SimpleCharStream.getPosition();
                                                                SimpleCharStream.getPosition());}
       break;
     default:
-      jj_la1[63] = jj_gen;
+      jj_la1[61] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2215,7 +2221,7 @@ final int pos = SimpleCharStream.getPosition();
                                  {if (true) return expr;}
       break;
     default:
-      jj_la1[64] = jj_gen;
+      jj_la1[62] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2264,8 +2270,8 @@ final int pos = SimpleCharStream.getPosition();
       case AT:
       case DOLLAR:
       case BANG:
-      case INCR:
-      case DECR:
+      case PLUS_PLUS:
+      case MINUS_MINUS:
       case PLUS:
       case MINUS:
       case BIT_AND:
@@ -2286,8 +2292,8 @@ final int pos = SimpleCharStream.getPosition();
         case AT:
         case DOLLAR:
         case BANG:
-        case INCR:
-        case DECR:
+        case PLUS_PLUS:
+        case MINUS_MINUS:
         case PLUS:
         case MINUS:
         case BIT_AND:
@@ -2311,13 +2317,13 @@ final int pos = SimpleCharStream.getPosition();
           expression = Type();
           break;
         default:
-          jj_la1[65] = jj_gen;
+          jj_la1[63] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
         break;
       default:
-        jj_la1[66] = jj_gen;
+        jj_la1[64] = jj_gen;
         ;
       }
       try {
@@ -2332,7 +2338,7 @@ final int pos = SimpleCharStream.getPosition();
    {if (true) return new ArrayDeclarator(prefix,expression,SimpleCharStream.getPosition());}
       break;
     default:
-      jj_la1[67] = jj_gen;
+      jj_la1[65] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2374,7 +2380,7 @@ final int pos = SimpleCharStream.getPosition();
                                     {if (true) return new NullLiteral(pos-4,pos);}
       break;
     default:
-      jj_la1[68] = jj_gen;
+      jj_la1[66] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2395,8 +2401,8 @@ Expression[] args = null;
     case AT:
     case DOLLAR:
     case BANG:
-    case INCR:
-    case DECR:
+    case PLUS_PLUS:
+    case MINUS_MINUS:
     case PLUS:
     case MINUS:
     case BIT_AND:
@@ -2409,7 +2415,7 @@ Expression[] args = null;
       args = ArgumentList();
       break;
     default:
-      jj_la1[69] = jj_gen;
+      jj_la1[67] = jj_gen;
       ;
     }
     try {
@@ -2442,7 +2448,7 @@ final ArrayList list = new ArrayList();
         ;
         break;
       default:
-        jj_la1[70] = jj_gen;
+        jj_la1[68] = jj_gen;
         break label_21;
       }
       jj_consume_token(COMMA);
@@ -2469,12 +2475,12 @@ final ArrayList list = new ArrayList();
   static final public Statement StatementNoBreak() throws ParseException {
   final Statement statement;
   Token token = null;
-    if (jj_2_6(2)) {
+    if (jj_2_8(2)) {
       statement = Expression();
       try {
         jj_consume_token(SEMICOLON);
       } catch (ParseException e) {
-    if (e.currentToken.next.kind != 4) {
+    if (e.currentToken.next.kind != PHPParserConstants.PHPEND) {
       errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
       errorLevel   = ERROR;
       errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
@@ -2483,7 +2489,7 @@ final ArrayList list = new ArrayList();
     }
       }
    {if (true) return statement;}
-    } else if (jj_2_7(2)) {
+    } else if (jj_2_9(2)) {
       statement = LabeledStatement();
                                   {if (true) return statement;}
     } else {
@@ -2499,8 +2505,8 @@ final ArrayList list = new ArrayList();
       case ARRAY:
       case NEW:
       case DOLLAR:
-      case INCR:
-      case DECR:
+      case PLUS_PLUS:
+      case MINUS_MINUS:
       case IDENTIFIER:
       case DOLLAR_ID:
         statement = StatementExpression();
@@ -2561,7 +2567,7 @@ final ArrayList list = new ArrayList();
           token = jj_consume_token(AT);
           break;
         default:
-          jj_la1[71] = jj_gen;
+          jj_la1[69] = jj_gen;
           ;
         }
         statement = IncludeStatement();
@@ -2578,8 +2584,12 @@ final ArrayList list = new ArrayList();
         statement = GlobalStatement();
                                          {if (true) return statement;}
         break;
+      case DEFINE:
+        statement = defineStatement();
+                                         currentSegment.add((Outlineable)statement);{if (true) return statement;}
+        break;
       default:
-        jj_la1[72] = jj_gen;
+        jj_la1[70] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2587,6 +2597,100 @@ final ArrayList list = new ArrayList();
     throw new Error("Missing return statement in function");
   }
 
+  static final public Define defineStatement() throws ParseException {
+  final int start = SimpleCharStream.getPosition();
+  Expression defineName,defineValue;
+    jj_consume_token(DEFINE);
+    try {
+      jj_consume_token(LPAREN);
+    } catch (ParseException e) {
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected";
+    errorLevel   = ERROR;
+    errorStart   = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+    errorEnd     = SimpleCharStream.getPosition() + 1;
+    processParseException(e);
+    }
+    try {
+      defineName = Expression();
+    } catch (ParseException e) {
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected";
+    errorLevel   = ERROR;
+    errorStart   = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+    errorEnd     = SimpleCharStream.getPosition() + 1;
+    {if (true) throw e;}
+    }
+    try {
+      jj_consume_token(COMMA);
+    } catch (ParseException e) {
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ',' expected";
+    errorLevel   = ERROR;
+    errorStart   = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+    errorEnd     = SimpleCharStream.getPosition() + 1;
+    processParseException(e);
+    }
+    try {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case PRINT:
+        defineValue = PrintExpression();
+        break;
+      default:
+        jj_la1[71] = jj_gen;
+        if (jj_2_10(2147483647)) {
+          defineValue = varAssignation();
+        } else {
+          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+          case ARRAY:
+          case NEW:
+          case NULL:
+          case TRUE:
+          case FALSE:
+          case AT:
+          case DOLLAR:
+          case BANG:
+          case PLUS_PLUS:
+          case MINUS_MINUS:
+          case PLUS:
+          case MINUS:
+          case BIT_AND:
+          case INTEGER_LITERAL:
+          case FLOATING_POINT_LITERAL:
+          case STRING_LITERAL:
+          case IDENTIFIER:
+          case LPAREN:
+          case DOLLAR_ID:
+            defineValue = ConditionalExpression();
+            break;
+          default:
+            jj_la1[72] = jj_gen;
+            jj_consume_token(-1);
+            throw new ParseException();
+          }
+        }
+      }
+    } catch (ParseException e) {
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected";
+    errorLevel   = ERROR;
+    errorStart   = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+    errorEnd     = SimpleCharStream.getPosition() + 1;
+    {if (true) throw e;}
+    }
+    try {
+      jj_consume_token(RPAREN);
+    } catch (ParseException e) {
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected";
+    errorLevel   = ERROR;
+    errorStart   = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+    errorEnd     = SimpleCharStream.getPosition() + 1;
+    processParseException(e);
+    }
+   {if (true) return new Define(currentSegment,
+                     defineName,
+                     defineValue,
+                     start,
+                     SimpleCharStream.getPosition());}
+    throw new Error("Missing return statement in function");
+  }
+
 /**
  * A Normal statement.
  */
@@ -2603,6 +2707,7 @@ final ArrayList list = new ArrayList();
     case INCLUDE_ONCE:
     case REQUIRE_ONCE:
     case GLOBAL:
+    case DEFINE:
     case STATIC:
     case CONTINUE:
     case DO:
@@ -2618,8 +2723,8 @@ final ArrayList list = new ArrayList();
     case AT:
     case DOLLAR:
     case BANG:
-    case INCR:
-    case DECR:
+    case PLUS_PLUS:
+    case MINUS_MINUS:
     case PLUS:
     case MINUS:
     case BIT_AND:
@@ -2680,16 +2785,17 @@ final ArrayList list = new ArrayList();
         throw new ParseException();
       }
     } catch (ParseException e) {
-    errorMessage = "End of file unexpected, '<?php' expected";
+    errorMessage = "unexpected end of file , '<?php' expected";
     errorLevel   = ERROR;
     errorStart   = SimpleCharStream.getPosition();
     errorEnd     = SimpleCharStream.getPosition();
     {if (true) throw e;}
     }
-  nbNodes = nodePtr-startIndex - 1;
+  nbNodes    = nodePtr - startIndex;
   blockNodes = new AstNode[nbNodes];
   System.arraycopy(nodes,startIndex,blockNodes,0,nbNodes);
-  {if (true) return new HTMLBlock(nodes);}
+  nodePtr = startIndex;
+  {if (true) return new HTMLBlock(blockNodes);}
     throw new Error("Missing return statement in function");
   }
 
@@ -2867,9 +2973,6 @@ final ArrayList list = new ArrayList();
     }
     try {
       jj_consume_token(SEMICOLON);
-    Expression[] exprs = new Expression[expressions.size()];
-    expressions.toArray(exprs);
-    {if (true) return new EchoStatement(exprs,pos);}
     } catch (ParseException e) {
     if (e.currentToken.next.kind != 4) {
       errorMessage = "';' expected after 'echo' statement";
@@ -2879,6 +2982,9 @@ final ArrayList list = new ArrayList();
       {if (true) throw e;}
     }
     }
+   Expression[] exprs = new Expression[expressions.size()];
+   expressions.toArray(exprs);
+   {if (true) return new EchoStatement(exprs,pos);}
     throw new Error("Missing return statement in function");
   }
 
@@ -3010,6 +3116,7 @@ final ArrayList list = new ArrayList();
       case INCLUDE_ONCE:
       case REQUIRE_ONCE:
       case GLOBAL:
+      case DEFINE:
       case STATIC:
       case CONTINUE:
       case DO:
@@ -3025,8 +3132,8 @@ final ArrayList list = new ArrayList();
       case AT:
       case DOLLAR:
       case BANG:
-      case INCR:
-      case DECR:
+      case PLUS_PLUS:
+      case MINUS_MINUS:
       case PLUS:
       case MINUS:
       case BIT_AND:
@@ -3058,6 +3165,7 @@ final ArrayList list = new ArrayList();
       case INCLUDE_ONCE:
       case REQUIRE_ONCE:
       case GLOBAL:
+      case DEFINE:
       case STATIC:
       case CONTINUE:
       case DO:
@@ -3073,8 +3181,8 @@ final ArrayList list = new ArrayList();
       case AT:
       case DOLLAR:
       case BANG:
-      case INCR:
-      case DECR:
+      case PLUS_PLUS:
+      case MINUS_MINUS:
       case PLUS:
       case MINUS:
       case BIT_AND:
@@ -3128,6 +3236,7 @@ final ArrayList list = new ArrayList();
     case INCLUDE_ONCE:
     case REQUIRE_ONCE:
     case GLOBAL:
+    case DEFINE:
     case STATIC:
     case CONTINUE:
     case DO:
@@ -3143,8 +3252,8 @@ final ArrayList list = new ArrayList();
     case AT:
     case DOLLAR:
     case BANG:
-    case INCR:
-    case DECR:
+    case PLUS_PLUS:
+    case MINUS_MINUS:
     case PLUS:
     case MINUS:
     case BIT_AND:
@@ -3156,8 +3265,18 @@ final ArrayList list = new ArrayList();
     case LBRACE:
     case SEMICOLON:
     case DOLLAR_ID:
-      statement = Statement();
+      try {
+        statement = Statement();
+                                   if (phpDocument == currentSegment) pushOnAstNodes(statement);
                                    {if (true) return statement;}
+      } catch (ParseException e) {
+    if (errorMessage != null) {if (true) throw e;}
+    errorMessage = "statement expected";
+    errorLevel   = ERROR;
+    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+    errorEnd   = SimpleCharStream.getPosition() + 1;
+    {if (true) throw e;}
+      }
       break;
     case CLASS:
       statement = ClassDeclaration();
@@ -3165,6 +3284,8 @@ final ArrayList list = new ArrayList();
       break;
     case FUNCTION:
       statement = MethodDeclaration();
+                                   if (phpDocument == currentSegment) pushOnAstNodes(statement);
+                                   currentSegment.add((MethodDeclaration) statement);
                                    {if (true) return statement;}
       break;
     default:
@@ -3191,6 +3312,7 @@ final ArrayList list = new ArrayList();
     case INCLUDE_ONCE:
     case REQUIRE_ONCE:
     case GLOBAL:
+    case DEFINE:
     case STATIC:
     case CONTINUE:
     case DO:
@@ -3206,8 +3328,8 @@ final ArrayList list = new ArrayList();
     case AT:
     case DOLLAR:
     case BANG:
-    case INCR:
-    case DECR:
+    case PLUS_PLUS:
+    case MINUS_MINUS:
     case PLUS:
     case MINUS:
     case BIT_AND:
@@ -3228,6 +3350,7 @@ final ArrayList list = new ArrayList();
       break;
     case FUNCTION:
       statement = MethodDeclaration();
+                                   currentSegment.add((MethodDeclaration) statement);
                                    {if (true) return statement;}
       break;
     default:
@@ -3298,12 +3421,12 @@ final ArrayList list = new ArrayList();
     throw new Error("Missing return statement in function");
   }
 
-  static final public Statement StatementExpression() throws ParseException {
+  static final public Expression StatementExpression() throws ParseException {
   Expression expr,expr2;
   int operator;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case INCR:
-    case DECR:
+    case PLUS_PLUS:
+    case MINUS_MINUS:
       expr = PreIncDecExpression();
                                 {if (true) return expr;}
       break;
@@ -3314,8 +3437,8 @@ final ArrayList list = new ArrayList();
     case DOLLAR_ID:
       expr = PrimaryExpression();
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case INCR:
-      case DECR:
+      case PLUS_PLUS:
+      case MINUS_MINUS:
       case ASSIGN:
       case PLUSASSIGN:
       case MINUSASSIGN:
@@ -3330,15 +3453,15 @@ final ArrayList list = new ArrayList();
       case LSHIFTASSIGN:
       case RSIGNEDSHIFTASSIGN:
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-        case INCR:
-          jj_consume_token(INCR);
-            {if (true) return new PostfixedUnaryExpression(expr,
+        case PLUS_PLUS:
+          jj_consume_token(PLUS_PLUS);
+                 {if (true) return new PostfixedUnaryExpression(expr,
                                                 OperatorIds.PLUS_PLUS,
                                                 SimpleCharStream.getPosition());}
           break;
-        case DECR:
-          jj_consume_token(DECR);
-            {if (true) return new PostfixedUnaryExpression(expr,
+        case MINUS_MINUS:
+          jj_consume_token(MINUS_MINUS);
+                   {if (true) return new PostfixedUnaryExpression(expr,
                                                 OperatorIds.MINUS_MINUS,
                                                 SimpleCharStream.getPosition());}
           break;
@@ -3542,6 +3665,7 @@ final ArrayList list = new ArrayList();
       case INCLUDE_ONCE:
       case REQUIRE_ONCE:
       case GLOBAL:
+      case DEFINE:
       case STATIC:
       case CONTINUE:
       case DO:
@@ -3557,8 +3681,8 @@ final ArrayList list = new ArrayList();
       case AT:
       case DOLLAR:
       case BANG:
-      case INCR:
-      case DECR:
+      case PLUS_PLUS:
+      case MINUS_MINUS:
       case PLUS:
       case MINUS:
       case BIT_AND:
@@ -3589,6 +3713,7 @@ final ArrayList list = new ArrayList();
       case INCLUDE_ONCE:
       case REQUIRE_ONCE:
       case GLOBAL:
+      case DEFINE:
       case STATIC:
       case CONTINUE:
       case DO:
@@ -3604,8 +3729,8 @@ final ArrayList list = new ArrayList();
       case AT:
       case DOLLAR:
       case BANG:
-      case INCR:
-      case DECR:
+      case PLUS_PLUS:
+      case MINUS_MINUS:
       case PLUS:
       case MINUS:
       case BIT_AND:
@@ -3716,8 +3841,8 @@ final ArrayList list = new ArrayList();
     case AT:
     case DOLLAR:
     case BANG:
-    case INCR:
-    case DECR:
+    case PLUS_PLUS:
+    case MINUS_MINUS:
     case PLUS:
     case MINUS:
     case BIT_AND:
@@ -3771,14 +3896,14 @@ final ArrayList list = new ArrayList();
     condition = Expression();
     try {
       jj_consume_token(RPAREN);
-      {if (true) return condition;}
     } catch (ParseException e) {
     errorMessage = "')' expected after " + keyword + " keyword";
     errorLevel   = ERROR;
     errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd   = SimpleCharStream.getPosition() + 1;
-    {if (true) throw e;}
+    processParseException(e);
     }
+   {if (true) return condition;}
     throw new Error("Missing return statement in function");
   }
 
@@ -3812,6 +3937,7 @@ final ArrayList list = new ArrayList();
         case INCLUDE_ONCE:
         case REQUIRE_ONCE:
         case GLOBAL:
+        case DEFINE:
         case STATIC:
         case CONTINUE:
         case DO:
@@ -3827,8 +3953,8 @@ final ArrayList list = new ArrayList();
         case AT:
         case DOLLAR:
         case BANG:
-        case INCR:
-        case DECR:
+        case PLUS_PLUS:
+        case MINUS_MINUS:
         case PLUS:
         case MINUS:
         case BIT_AND:
@@ -3858,6 +3984,7 @@ final ArrayList list = new ArrayList();
         case INCLUDE_ONCE:
         case REQUIRE_ONCE:
         case GLOBAL:
+        case DEFINE:
         case STATIC:
         case CONTINUE:
         case DO:
@@ -3873,8 +4000,8 @@ final ArrayList list = new ArrayList();
         case AT:
         case DOLLAR:
         case BANG:
-        case INCR:
-        case DECR:
+        case PLUS_PLUS:
+        case MINUS_MINUS:
         case PLUS:
         case MINUS:
         case BIT_AND:
@@ -3963,10 +4090,10 @@ final ArrayList list = new ArrayList();
       stmts.toArray(statementsArray);
       {if (true) return new IfStatement(condition,
                              new Block(statementsArray,pos,endStatements),
-                              elseIfs,
-                              elseStatement,
-                              pos,
-                              SimpleCharStream.getPosition());}
+                             elseIfs,
+                             elseStatement,
+                             pos,
+                             SimpleCharStream.getPosition());}
     }
       break;
     case PHPEND:
@@ -3981,6 +4108,7 @@ final ArrayList list = new ArrayList();
     case INCLUDE_ONCE:
     case REQUIRE_ONCE:
     case GLOBAL:
+    case DEFINE:
     case STATIC:
     case CONTINUE:
     case DO:
@@ -3996,8 +4124,8 @@ final ArrayList list = new ArrayList();
     case AT:
     case DOLLAR:
     case BANG:
-    case INCR:
-    case DECR:
+    case PLUS_PLUS:
+    case MINUS_MINUS:
     case PLUS:
     case MINUS:
     case BIT_AND:
@@ -4021,6 +4149,7 @@ final ArrayList list = new ArrayList();
       case INCLUDE_ONCE:
       case REQUIRE_ONCE:
       case GLOBAL:
+      case DEFINE:
       case STATIC:
       case CONTINUE:
       case DO:
@@ -4036,8 +4165,8 @@ final ArrayList list = new ArrayList();
       case AT:
       case DOLLAR:
       case BANG:
-      case INCR:
-      case DECR:
+      case PLUS_PLUS:
+      case MINUS_MINUS:
       case PLUS:
       case MINUS:
       case BIT_AND:
@@ -4134,6 +4263,7 @@ final ArrayList list = new ArrayList();
       case INCLUDE_ONCE:
       case REQUIRE_ONCE:
       case GLOBAL:
+      case DEFINE:
       case STATIC:
       case CONTINUE:
       case DO:
@@ -4149,8 +4279,8 @@ final ArrayList list = new ArrayList();
       case AT:
       case DOLLAR:
       case BANG:
-      case INCR:
-      case DECR:
+      case PLUS_PLUS:
+      case MINUS_MINUS:
       case PLUS:
       case MINUS:
       case BIT_AND:
@@ -4180,6 +4310,7 @@ final ArrayList list = new ArrayList();
       case INCLUDE_ONCE:
       case REQUIRE_ONCE:
       case GLOBAL:
+      case DEFINE:
       case STATIC:
       case CONTINUE:
       case DO:
@@ -4195,8 +4326,8 @@ final ArrayList list = new ArrayList();
       case AT:
       case DOLLAR:
       case BANG:
-      case INCR:
-      case DECR:
+      case PLUS_PLUS:
+      case MINUS_MINUS:
       case PLUS:
       case MINUS:
       case BIT_AND:
@@ -4248,6 +4379,7 @@ final ArrayList list = new ArrayList();
       case INCLUDE_ONCE:
       case REQUIRE_ONCE:
       case GLOBAL:
+      case DEFINE:
       case STATIC:
       case CONTINUE:
       case DO:
@@ -4263,8 +4395,8 @@ final ArrayList list = new ArrayList();
       case AT:
       case DOLLAR:
       case BANG:
-      case INCR:
-      case DECR:
+      case PLUS_PLUS:
+      case MINUS_MINUS:
       case PLUS:
       case MINUS:
       case BIT_AND:
@@ -4294,6 +4426,7 @@ final ArrayList list = new ArrayList();
       case INCLUDE_ONCE:
       case REQUIRE_ONCE:
       case GLOBAL:
+      case DEFINE:
       case STATIC:
       case CONTINUE:
       case DO:
@@ -4309,8 +4442,8 @@ final ArrayList list = new ArrayList();
       case AT:
       case DOLLAR:
       case BANG:
-      case INCR:
-      case DECR:
+      case PLUS_PLUS:
+      case MINUS_MINUS:
       case PLUS:
       case MINUS:
       case BIT_AND:
@@ -4388,6 +4521,7 @@ final ArrayList list = new ArrayList();
         case INCLUDE_ONCE:
         case REQUIRE_ONCE:
         case GLOBAL:
+        case DEFINE:
         case STATIC:
         case CONTINUE:
         case DO:
@@ -4403,8 +4537,8 @@ final ArrayList list = new ArrayList();
         case AT:
         case DOLLAR:
         case BANG:
-        case INCR:
-        case DECR:
+        case PLUS_PLUS:
+        case MINUS_MINUS:
         case PLUS:
         case MINUS:
         case BIT_AND:
@@ -4468,6 +4602,7 @@ final ArrayList list = new ArrayList();
     case INCLUDE_ONCE:
     case REQUIRE_ONCE:
     case GLOBAL:
+    case DEFINE:
     case STATIC:
     case CONTINUE:
     case DO:
@@ -4483,8 +4618,8 @@ final ArrayList list = new ArrayList();
     case AT:
     case DOLLAR:
     case BANG:
-    case INCR:
-    case DECR:
+    case PLUS_PLUS:
+    case MINUS_MINUS:
     case PLUS:
     case MINUS:
     case BIT_AND:
@@ -4600,9 +4735,9 @@ final ArrayList list = new ArrayList();
   static final public ForStatement ForStatement() throws ParseException {
 final Token token;
 final int pos = SimpleCharStream.getPosition();
-Statement[] initializations = null;
+Expression[] initializations = null;
 Expression condition = null;
-Statement[] increments = null;
+Expression[] increments = null;
 Statement action;
 final ArrayList list = new ArrayList();
 final int startBlock, endBlock;
@@ -4620,8 +4755,8 @@ final int startBlock, endBlock;
     case ARRAY:
     case NEW:
     case DOLLAR:
-    case INCR:
-    case DECR:
+    case PLUS_PLUS:
+    case MINUS_MINUS:
     case IDENTIFIER:
     case DOLLAR_ID:
       initializations = ForInit();
@@ -4642,8 +4777,8 @@ final int startBlock, endBlock;
     case AT:
     case DOLLAR:
     case BANG:
-    case INCR:
-    case DECR:
+    case PLUS_PLUS:
+    case MINUS_MINUS:
     case PLUS:
     case MINUS:
     case BIT_AND:
@@ -4664,8 +4799,8 @@ final int startBlock, endBlock;
     case ARRAY:
     case NEW:
     case DOLLAR:
-    case INCR:
-    case DECR:
+    case PLUS_PLUS:
+    case MINUS_MINUS:
     case IDENTIFIER:
     case DOLLAR_ID:
       increments = StatementExpressionList();
@@ -4687,6 +4822,7 @@ final int startBlock, endBlock;
     case INCLUDE_ONCE:
     case REQUIRE_ONCE:
     case GLOBAL:
+    case DEFINE:
     case STATIC:
     case CONTINUE:
     case DO:
@@ -4702,8 +4838,8 @@ final int startBlock, endBlock;
     case AT:
     case DOLLAR:
     case BANG:
-    case INCR:
-    case DECR:
+    case PLUS_PLUS:
+    case MINUS_MINUS:
     case PLUS:
     case MINUS:
     case BIT_AND:
@@ -4735,6 +4871,7 @@ final int startBlock, endBlock;
         case INCLUDE_ONCE:
         case REQUIRE_ONCE:
         case GLOBAL:
+        case DEFINE:
         case STATIC:
         case CONTINUE:
         case DO:
@@ -4750,8 +4887,8 @@ final int startBlock, endBlock;
         case AT:
         case DOLLAR:
         case BANG:
-        case INCR:
-        case DECR:
+        case PLUS_PLUS:
+        case MINUS_MINUS:
         case PLUS:
         case MINUS:
         case BIT_AND:
@@ -4813,22 +4950,22 @@ final int startBlock, endBlock;
     throw new Error("Missing return statement in function");
   }
 
-  static final public Statement[] ForInit() throws ParseException {
-  Statement[] statements;
-    if (jj_2_8(2147483647)) {
-      statements = LocalVariableDeclaration();
-   {if (true) return statements;}
+  static final public Expression[] ForInit() throws ParseException {
+  Expression[] exprs;
+    if (jj_2_11(2147483647)) {
+      exprs = LocalVariableDeclaration();
+   {if (true) return exprs;}
     } else {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case ARRAY:
       case NEW:
       case DOLLAR:
-      case INCR:
-      case DECR:
+      case PLUS_PLUS:
+      case MINUS_MINUS:
       case IDENTIFIER:
       case DOLLAR_ID:
-        statements = StatementExpressionList();
-   {if (true) return statements;}
+        exprs = StatementExpressionList();
+   {if (true) return exprs;}
         break;
       default:
         jj_la1[119] = jj_gen;
@@ -4839,9 +4976,9 @@ final int startBlock, endBlock;
     throw new Error("Missing return statement in function");
   }
 
-  static final public Statement[] StatementExpressionList() throws ParseException {
+  static final public Expression[] StatementExpressionList() throws ParseException {
   final ArrayList list = new ArrayList();
-  Statement expr;
+  Expression expr;
     expr = StatementExpression();
                                   list.add(expr);
     label_39:
@@ -4858,9 +4995,9 @@ final int startBlock, endBlock;
       StatementExpression();
                                   list.add(expr);
     }
-  Statement[] stmtsArray = new Statement[list.size()];
-  list.toArray(stmtsArray);
-  {if (true) return stmtsArray;}
+  Expression[] exprsArray = new Expression[list.size()];
+  list.toArray(exprsArray);
+  {if (true) return exprsArray;}
     throw new Error("Missing return statement in function");
   }
 
@@ -4879,8 +5016,8 @@ final int startBlock, endBlock;
     case AT:
     case DOLLAR:
     case BANG:
-    case INCR:
-    case DECR:
+    case PLUS_PLUS:
+    case MINUS_MINUS:
     case PLUS:
     case MINUS:
     case BIT_AND:
@@ -4924,8 +5061,8 @@ final int startBlock, endBlock;
     case AT:
     case DOLLAR:
     case BANG:
-    case INCR:
-    case DECR:
+    case PLUS_PLUS:
+    case MINUS_MINUS:
     case PLUS:
     case MINUS:
     case BIT_AND:
@@ -5010,155 +5147,199 @@ final int startBlock, endBlock;
     return retval;
   }
 
-  static final private boolean jj_3R_83() {
-    if (jj_scan_token(OBJECT)) return true;
+  static final private boolean jj_2_9(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    boolean retval = !jj_3_9();
+    jj_save(8, xla);
+    return retval;
+  }
+
+  static final private boolean jj_2_10(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    boolean retval = !jj_3_10();
+    jj_save(9, xla);
+    return retval;
+  }
+
+  static final private boolean jj_2_11(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    boolean retval = !jj_3_11();
+    jj_save(10, xla);
+    return retval;
+  }
+
+  static final private boolean jj_3R_59() {
+    if (jj_3R_90()) 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(INTEGER)) return true;
+  static final private boolean jj_3R_58() {
+    if (jj_3R_42()) 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(ARRAY)) return true;
+  static final private boolean jj_3R_57() {
+    if (jj_3R_89()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_184() {
-    if (jj_scan_token(ARRAY)) return true;
+  static final private boolean jj_3R_46() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_56()) {
+    jj_scanpos = xsp;
+    if (jj_3R_57()) {
+    jj_scanpos = xsp;
+    if (jj_3R_58()) {
+    jj_scanpos = xsp;
+    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;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_81() {
-    if (jj_scan_token(INT)) return true;
+  static final private boolean jj_3R_56() {
+    if (jj_3R_88()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_183() {
-    if (jj_3R_52()) return true;
+  static final private boolean jj_3R_200() {
+    if (jj_scan_token(MINUS_MINUS)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_80() {
-    if (jj_scan_token(FLOAT)) return true;
+  static final private boolean jj_3R_199() {
+    if (jj_scan_token(PLUS_PLUS)) 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(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;
+  static final private boolean jj_3R_192() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_99()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_100()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
-    if (jj_scan_token(RPAREN)) return true;
+    if (jj_3R_199()) {
+    jj_scanpos = xsp;
+    if (jj_3R_200()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    xsp = jj_scanpos;
-    if (jj_3R_101()) jj_scanpos = xsp;
-    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_167() {
-    if (jj_scan_token(LPAREN)) return true;
+  static final private boolean jj_3R_175() {
+    if (jj_3R_173()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_183()) {
-    jj_scanpos = xsp;
-    if (jj_3R_184()) 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_scan_token(RPAREN)) return true;
+    if (jj_3R_192()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_86() {
+    if (jj_scan_token(OBJECT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_139()) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_85() {
+    if (jj_scan_token(INTEGER)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_79() {
-    if (jj_scan_token(DOUBLE)) return true;
+  static final private boolean jj_3R_84() {
+    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_43() {
-    if (jj_3R_52()) return true;
+  static final private boolean jj_3R_44() {
+    if (jj_scan_token(ARRAY)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_78() {
-    if (jj_scan_token(REAL)) return true;
+  static final private boolean jj_3R_83() {
+    if (jj_scan_token(FLOAT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_77() {
-    if (jj_scan_token(BOOLEAN)) return true;
+  static final private boolean jj_3R_191() {
+    if (jj_scan_token(ARRAY)) 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(PRINT)) return true;
+  static final private boolean jj_3R_82() {
+    if (jj_scan_token(DOUBLE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_45()) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_190() {
+    if (jj_3R_53()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_76() {
-    if (jj_scan_token(BOOL)) return true;
+  static final private boolean jj_3R_81() {
+    if (jj_scan_token(REAL)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3_4() {
+  static final private boolean jj_3R_174() {
     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_43()) {
+    if (jj_3R_190()) {
     jj_scanpos = xsp;
-    if (jj_3R_44()) 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;
     if (jj_scan_token(RPAREN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_146()) return true;
+    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_80() {
+    if (jj_scan_token(BOOLEAN)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_79() {
+    if (jj_scan_token(BOOL)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_43() {
+    if (jj_3R_53()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_78() {
     if (jj_scan_token(STRING)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_52() {
+  static final private boolean jj_3R_53() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_75()) {
-    jj_scanpos = xsp;
-    if (jj_3R_76()) {
-    jj_scanpos = xsp;
-    if (jj_3R_77()) {
-    jj_scanpos = xsp;
     if (jj_3R_78()) {
     jj_scanpos = xsp;
     if (jj_3R_79()) {
@@ -5169,7 +5350,13 @@ final int startBlock, endBlock;
     jj_scanpos = xsp;
     if (jj_3R_82()) {
     jj_scanpos = xsp;
-    if (jj_3R_83()) return true;
+    if (jj_3R_83()) {
+    jj_scanpos = xsp;
+    if (jj_3R_84()) {
+    jj_scanpos = xsp;
+    if (jj_3R_85()) {
+    jj_scanpos = xsp;
+    if (jj_3R_86()) 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;
@@ -5182,46 +5369,69 @@ final int startBlock, endBlock;
     return false;
   }
 
-  static final private boolean jj_3R_165() {
+  static final private boolean jj_3_4() {
     if (jj_scan_token(LPAREN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_45()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_43()) {
+    jj_scanpos = xsp;
+    if (jj_3R_44()) 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_scan_token(RPAREN)) 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;
+  static final private boolean jj_3R_91() {
+    if (jj_scan_token(ASSIGN)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_46()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_163() {
-    if (jj_3R_168()) return true;
+  static final private boolean jj_3R_172() {
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_46()) 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;
     return false;
   }
 
-  static final private boolean jj_3R_162() {
-    if (jj_3R_167()) return true;
+  static final private boolean jj_3R_171() {
+    if (jj_3R_176()) 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_170() {
+    if (jj_3R_175()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  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_165() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_161()) {
+    if (jj_3R_168()) {
     jj_scanpos = xsp;
-    if (jj_3R_162()) {
+    if (jj_3R_169()) {
     jj_scanpos = xsp;
-    if (jj_3R_163()) {
+    if (jj_3R_170()) {
     jj_scanpos = xsp;
-    if (jj_3R_164()) {
+    if (jj_3R_171()) {
     jj_scanpos = xsp;
-    if (jj_3R_165()) return true;
+    if (jj_3R_172()) 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;
@@ -5230,641 +5440,637 @@ final int startBlock, endBlock;
     return false;
   }
 
-  static final private boolean jj_3R_161() {
+  static final private boolean jj_3R_168() {
     if (jj_scan_token(BANG)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_139()) return true;
+    if (jj_3R_146()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_160() {
-    if (jj_scan_token(DECR)) return true;
+  static final private boolean jj_3R_167() {
+    if (jj_scan_token(MINUS_MINUS)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_159() {
-    if (jj_scan_token(INCR)) return true;
+  static final private boolean jj_3R_166() {
+    if (jj_scan_token(PLUS_PLUS)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_157() {
+  static final private boolean jj_3R_164() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_159()) {
+    if (jj_3R_166()) {
     jj_scanpos = xsp;
-    if (jj_3R_160()) return true;
+    if (jj_3R_167()) 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_166()) return true;
+    if (jj_3R_173()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_152() {
-    if (jj_3R_158()) return true;
+  static final private boolean jj_3_10() {
+    if (jj_3R_42()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_151() {
-    if (jj_3R_157()) return true;
+  static final private boolean jj_3R_159() {
+    if (jj_3R_165()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_156() {
+  static final private boolean jj_3R_158() {
+    if (jj_3R_164()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_163() {
     if (jj_scan_token(MINUS)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_155() {
+  static final private boolean jj_3R_60() {
+    if (jj_3R_51()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_91()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_162() {
     if (jj_scan_token(PLUS)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_148() {
+  static final private boolean jj_3R_155() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_150()) {
+    if (jj_3R_157()) {
     jj_scanpos = xsp;
-    if (jj_3R_151()) {
+    if (jj_3R_158()) {
     jj_scanpos = xsp;
-    if (jj_3R_152()) 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;
     return false;
   }
 
-  static final private boolean jj_3R_150() {
+  static final private boolean jj_3R_157() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_155()) {
+    if (jj_3R_162()) {
     jj_scanpos = xsp;
-    if (jj_3R_156()) return true;
+    if (jj_3R_163()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_139()) return true;
+    if (jj_3R_146()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_154() {
-    if (jj_3R_148()) 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;
+    if (jj_3R_60()) 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_161() {
+    if (jj_3R_155()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_48() {
+    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_61()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
+    return false;
+  }
+
+  static final private boolean jj_3R_156() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_153()) {
+    if (jj_3R_160()) {
     jj_scanpos = xsp;
-    if (jj_3R_154()) return true;
+    if (jj_3R_161()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_153() {
+  static final private boolean jj_3R_160() {
     if (jj_scan_token(AT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_149()) return true;
+    if (jj_3R_156()) 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_3R_156()) 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_146() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_143()) {
+    if (jj_3R_150()) {
     jj_scanpos = xsp;
-    if (jj_3R_144()) 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;
     return false;
   }
 
-  static final private boolean jj_3R_143() {
+  static final private boolean jj_3R_150() {
     if (jj_scan_token(BIT_AND)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_148()) return true;
+    if (jj_3R_155()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_147() {
+  static final private boolean jj_3R_154() {
     if (jj_scan_token(REMAINDER)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_146() {
+  static final private boolean jj_3R_153() {
     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_145() {
+  static final private boolean jj_3R_152() {
     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_140() {
+  static final private boolean jj_3R_147() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_145()) {
+    if (jj_3R_152()) {
     jj_scanpos = xsp;
-    if (jj_3R_146()) {
+    if (jj_3R_153()) {
     jj_scanpos = xsp;
-    if (jj_3R_147()) return true;
+    if (jj_3R_154()) 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_139()) return true;
+    if (jj_3R_146()) 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(ASSIGN)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_45()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_134() {
-    if (jj_3R_139()) return true;
+  static final private boolean jj_3R_141() {
+    if (jj_3R_146()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_140()) { jj_scanpos = xsp; break; }
+      if (jj_3R_147()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_142() {
+  static final private boolean jj_3_9() {
+    if (jj_3R_47()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_149() {
     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_141() {
+  static final private boolean jj_3R_148() {
     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_135() {
+  static final private boolean jj_3R_202() {
+    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_142() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_141()) {
+    if (jj_3R_148()) {
     jj_scanpos = xsp;
-    if (jj_3R_142()) 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;
-    if (jj_3R_134()) return true;
+    if (jj_3R_141()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_128() {
-    if (jj_3R_134()) return true;
+  static final private boolean jj_3_2() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_41()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_135() {
+    if (jj_3R_141()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_135()) { jj_scanpos = xsp; break; }
+      if (jj_3R_142()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_198() {
-    if (jj_scan_token(COMMA)) return true;
+  static final private boolean jj_3R_201() {
+    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_3_2()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
     return false;
   }
 
-  static final private boolean jj_3_7() {
+  static final private boolean jj_3_8() {
     if (jj_3R_46()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3_2() {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_41()) return true;
+    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_197() {
-    if (jj_3R_41()) return true;
+  static final private boolean jj_3R_145() {
+    if (jj_scan_token(RUNSIGNEDSHIFT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3_2()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
     return false;
   }
 
-  static final private boolean jj_3R_57() {
-    if (jj_3R_50()) return true;
+  static final private boolean jj_3R_198() {
+    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_87()) jj_scanpos = xsp;
+    if (jj_3R_201()) jj_scanpos = xsp;
     else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_138() {
-    if (jj_scan_token(RUNSIGNEDSHIFT)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_202()) 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_137() {
+  static final private boolean jj_3R_144() {
     if (jj_scan_token(RSIGNEDSHIFT)) 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_143() {
     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_129() {
+  static final private boolean jj_3R_136() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_136()) {
+    if (jj_3R_143()) {
     jj_scanpos = xsp;
-    if (jj_3R_137()) {
+    if (jj_3R_144()) {
     jj_scanpos = xsp;
-    if (jj_3R_138()) return true;
+    if (jj_3R_145()) 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_128()) 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_121() {
-    if (jj_3R_128()) return true;
+  static final private boolean jj_3R_128() {
+    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_129()) { jj_scanpos = xsp; break; }
+      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_3_6() {
-    if (jj_3R_45()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(SEMICOLON)) return true;
+  static final private boolean jj_3_11() {
+    if (jj_3R_48()) 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(LPAREN)) return true;
+  static final private boolean jj_3R_203() {
+    if (jj_scan_token(ARRAYASSIGN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_197()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    xsp = jj_scanpos;
-    if (jj_3R_198()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(RPAREN)) return true;
+    if (jj_3R_46()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_58() {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_57()) return true;
+  static final private boolean jj_3R_41() {
+    if (jj_3R_46()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_203()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
   static final private boolean jj_3R_47() {
-    if (jj_3R_57()) return true;
+    if (jj_scan_token(IDENTIFIER)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_58()) { 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(GE)) 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_201() {
-    if (jj_scan_token(ARRAYASSIGN)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_45()) return true;
+  static final private boolean jj_3R_140() {
+    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_132() {
+  static final private boolean jj_3R_139() {
     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_131() {
+  static final private boolean jj_3R_138() {
     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_41() {
-    if (jj_3R_45()) return true;
+  static final private boolean jj_3R_137() {
+    if (jj_scan_token(LT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_201()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_130() {
-    if (jj_scan_token(LT)) return true;
+  static final private boolean jj_3R_110() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_46()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_122() {
+  static final private boolean jj_3R_129() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_130()) {
+    if (jj_3R_137()) {
     jj_scanpos = xsp;
-    if (jj_3R_131()) {
+    if (jj_3R_138()) {
     jj_scanpos = xsp;
-    if (jj_3R_132()) {
+    if (jj_3R_139()) {
     jj_scanpos = xsp;
-    if (jj_3R_133()) 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;
     } 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_121()) return true;
+    if (jj_3R_128()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_119() {
-    if (jj_3R_121()) return true;
+  static final private boolean jj_3R_126() {
+    if (jj_3R_128()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_122()) { jj_scanpos = xsp; break; }
+      if (jj_3R_129()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_203() {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_45()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_202() {
-    if (jj_3R_45()) return true;
+  static final private boolean jj_3R_107() {
+    if (jj_3R_46()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_203()) { jj_scanpos = xsp; break; }
+      if (jj_3R_110()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_127() {
-    if (jj_scan_token(TRIPLEEQUAL)) 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;
     return false;
   }
 
-  static final private boolean jj_3R_200() {
-    if (jj_3R_202()) return true;
+  static final private boolean jj_3R_97() {
+    if (jj_3R_53()) 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(BANGDOUBLEEQUAL)) return true;
+  static final private boolean jj_3R_134() {
+    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_125() {
-    if (jj_scan_token(NOT_EQUAL)) return true;
+  static final private boolean jj_3R_133() {
+    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_124() {
-    if (jj_scan_token(DIF)) return true;
+  static final private boolean jj_3R_132() {
+    if (jj_scan_token(NOT_EQUAL)) 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(EQUAL_EQUAL)) return true;
+  static final private boolean jj_3R_87() {
+    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_120() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_123()) {
-    jj_scanpos = xsp;
-    if (jj_3R_124()) {
-    jj_scanpos = xsp;
-    if (jj_3R_125()) {
-    jj_scanpos = xsp;
-    if (jj_3R_126()) {
-    jj_scanpos = xsp;
-    if (jj_3R_127()) 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_119()) return true;
+    if (jj_3R_100()) 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_108() {
+  static final private boolean jj_3R_115() {
     if (jj_scan_token(LBRACE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_45()) return true;
+    if (jj_3R_46()) 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_93() {
-    if (jj_3R_52()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_117() {
-    if (jj_3R_119()) return true;
+  static final private boolean jj_3R_131() {
+    if (jj_scan_token(DIF)) 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_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
     return false;
   }
 
-  static final private boolean jj_3R_199() {
-    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_200()) 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_130() {
+    if (jj_scan_token(EQUAL_EQUAL)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_91() {
+  static final private boolean jj_3R_95() {
     if (jj_scan_token(DOLLAR_ID)) 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(DOLLAR)) return true;
+  static final private boolean jj_3R_127() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_130()) {
+    jj_scanpos = xsp;
+    if (jj_3R_131()) {
+    jj_scanpos = xsp;
+    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;
-    if (jj_3R_59()) return true;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_126()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_118() {
-    if (jj_scan_token(BIT_AND)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_117()) return true;
+  static final private boolean jj_3R_124() {
+    if (jj_3R_126()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_127()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
     return false;
   }
 
-  static final private boolean jj_3R_177() {
+  static final private boolean jj_3R_184() {
     if (jj_scan_token(NULL)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_176() {
+  static final private boolean jj_3R_183() {
     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_115() {
-    if (jj_3R_117()) 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;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_118()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
     return false;
   }
 
-  static final private boolean jj_3R_175() {
+  static final private boolean jj_3R_182() {
     if (jj_scan_token(TRUE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_174() {
+  static final private boolean jj_3R_181() {
     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_173() {
+  static final private boolean jj_3R_180() {
     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_89() {
-    if (jj_scan_token(IDENTIFIER)) return true;
+  static final private boolean jj_3R_125() {
+    if (jj_scan_token(BIT_AND)) return true;
+    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;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_108()) jj_scanpos = xsp;
-    else 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_179() {
+    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_176() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_172()) {
+    if (jj_3R_179()) {
     jj_scanpos = xsp;
-    if (jj_3R_173()) {
+    if (jj_3R_180()) {
     jj_scanpos = xsp;
-    if (jj_3R_174()) {
+    if (jj_3R_181()) {
     jj_scanpos = xsp;
-    if (jj_3R_175()) {
+    if (jj_3R_182()) {
     jj_scanpos = xsp;
-    if (jj_3R_176()) {
+    if (jj_3R_183()) {
     jj_scanpos = xsp;
-    if (jj_3R_177()) return true;
+    if (jj_3R_184()) 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;
@@ -5874,40 +6080,65 @@ final int startBlock, endBlock;
     return false;
   }
 
-  static final private boolean jj_3R_172() {
-    if (jj_scan_token(INTEGER_LITERAL)) return true;
+  static final private boolean jj_3R_122() {
+    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_116() {
-    if (jj_scan_token(XOR)) return true;
+  static final private boolean jj_3R_93() {
+    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_115()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_96() {
+    if (jj_3R_46()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_115()) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_63() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_96()) {
+    jj_scanpos = xsp;
+    if (jj_3R_97()) 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_88() {
+  static final private boolean jj_3R_92() {
     if (jj_scan_token(LBRACE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_45()) return true;
+    if (jj_3R_46()) 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_59() {
+  static final private boolean jj_3R_62() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_88()) {
+    if (jj_3R_92()) {
     jj_scanpos = xsp;
-    if (jj_3R_89()) {
+    if (jj_3R_93()) {
     jj_scanpos = xsp;
-    if (jj_3R_90()) {
+    if (jj_3R_94()) {
     jj_scanpos = xsp;
-    if (jj_3R_91()) return true;
+    if (jj_3R_95()) 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;
@@ -5915,274 +6146,272 @@ final int startBlock, endBlock;
     return false;
   }
 
-  static final private boolean jj_3R_113() {
-    if (jj_3R_115()) return true;
+  static final private boolean jj_3R_123() {
+    if (jj_scan_token(XOR)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      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_92() {
-    if (jj_3R_45()) return true;
+    if (jj_3R_122()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_60() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_92()) {
-    jj_scanpos = xsp;
-    if (jj_3R_93()) return true;
+  static final private boolean jj_3R_120() {
+    if (jj_3R_122()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_123()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
     return false;
   }
 
-  static final private boolean jj_3R_98() {
+  static final private boolean jj_3R_103() {
     if (jj_scan_token(LBRACE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_45()) return true;
+    if (jj_3R_46()) 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_46() {
-    if (jj_scan_token(IDENTIFIER)) return true;
+  static final private boolean jj_3R_50() {
+    if (jj_scan_token(LBRACKET)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(COLON)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    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_114() {
-    if (jj_scan_token(BIT_OR)) return true;
+  static final private boolean jj_3R_99() {
+    if (jj_scan_token(DOLLAR)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_113()) return true;
+    if (jj_3R_62()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_95() {
-    if (jj_scan_token(DOLLAR)) return true;
+  static final private boolean jj_3R_121() {
+    if (jj_scan_token(BIT_OR)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_59()) return true;
+    if (jj_3R_120()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_109() {
-    if (jj_3R_113()) return true;
+  static final private boolean jj_3R_116() {
+    if (jj_3R_120()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_114()) { jj_scanpos = xsp; break; }
+      if (jj_3R_121()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_49() {
-    if (jj_scan_token(LBRACKET)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+  static final private boolean jj_3R_40() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_60()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(RBRACKET)) return true;
+    if (jj_3R_49()) {
+    jj_scanpos = xsp;
+    if (jj_3R_50()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3_8() {
-    if (jj_3R_47()) return true;
+  static final private boolean jj_3R_49() {
+    if (jj_scan_token(CLASSACCESS)) 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_110() {
+  static final private boolean jj_3R_117() {
     if (jj_scan_token(DOT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_109()) return true;
+    if (jj_3R_116()) 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_98() {
     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_98()) jj_scanpos = xsp;
+    if (jj_3R_103()) jj_scanpos = xsp;
     else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_61() {
+  static final private boolean jj_3R_64() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_94()) {
+    if (jj_3R_98()) {
     jj_scanpos = xsp;
-    if (jj_3R_95()) return true;
+    if (jj_3R_99()) 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_104() {
-    if (jj_3R_109()) return true;
+  static final private boolean jj_3R_111() {
+    if (jj_3R_116()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_110()) { jj_scanpos = xsp; break; }
+      if (jj_3R_117()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_48() {
-    if (jj_scan_token(CLASSACCESS)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_59()) return true;
+  static final private boolean jj_3R_55() {
+    if (jj_3R_40()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_40() {
+  static final private boolean jj_3R_45() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_48()) {
+    if (jj_3R_54()) {
     jj_scanpos = xsp;
-    if (jj_3R_49()) return true;
+    if (jj_3R_55()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_112() {
-    if (jj_scan_token(_ANDL)) return true;
+  static final private boolean jj_3R_54() {
+    if (jj_3R_87()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_111() {
-    if (jj_scan_token(AND_AND)) return true;
+  static final private boolean jj_3R_119() {
+    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_196() {
-    if (jj_3R_40()) return true;
+  static final private boolean jj_3R_118() {
+    if (jj_scan_token(AND_AND)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_105() {
+  static final private boolean jj_3R_112() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_111()) {
+    if (jj_3R_118()) {
     jj_scanpos = xsp;
-    if (jj_3R_112()) return true;
+    if (jj_3R_119()) 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_104()) return true;
+    if (jj_3R_111()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_195() {
-    if (jj_3R_199()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_188() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_195()) {
-    jj_scanpos = xsp;
-    if (jj_3R_196()) return true;
+  static final private boolean jj_3R_194() {
+    if (jj_3R_51()) 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() {
+  static final private boolean jj_3R_102() {
     if (jj_scan_token(HOOK)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_45()) return true;
+    if (jj_3R_46()) 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_86()) return true;
+    if (jj_3R_90()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_102() {
-    if (jj_3R_104()) return true;
+  static final private boolean jj_3R_108() {
+    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_105()) { 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_3_1() {
-    if (jj_3R_40()) return true;
+  static final private boolean jj_3R_193() {
+    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_187() {
-    if (jj_3R_50()) return true;
+  static final private boolean jj_3R_185() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_193()) {
+    jj_scanpos = xsp;
+    if (jj_3R_194()) 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_107() {
+  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_46()) 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(_ORL)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_106() {
+  static final private boolean jj_3R_113() {
     if (jj_scan_token(OR_OR)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_186() {
-    if (jj_scan_token(IDENTIFIER)) return true;
+  static final private boolean jj_3_1() {
+    if (jj_3R_40()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_178() {
+  static final private boolean jj_3R_109() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_186()) {
+    if (jj_3R_113()) {
     jj_scanpos = xsp;
-    if (jj_3R_187()) return true;
+    if (jj_3R_114()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_108()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_50() {
-    if (jj_3R_61()) return true;
+  static final private boolean jj_3R_51() {
+    if (jj_3R_64()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
@@ -6193,156 +6422,195 @@ final int startBlock, endBlock;
     return false;
   }
 
-  static final private boolean jj_3R_103() {
+  static final private boolean jj_3R_101() {
+    if (jj_3R_108()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_106()) {
-    jj_scanpos = xsp;
-    if (jj_3R_107()) return true;
+    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_105() {
+    if (jj_scan_token(COMMA)) 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_102()) return true;
+    if (jj_3R_51()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_96() {
-    if (jj_3R_102()) return true;
+  static final private boolean jj_3R_104() {
+    if (jj_3R_51()) 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_86() {
-    if (jj_3R_96()) return true;
+  static final private boolean jj_3R_90() {
+    if (jj_3R_101()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_97()) jj_scanpos = xsp;
+    if (jj_3R_102()) jj_scanpos = xsp;
     else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_74() {
-    if (jj_scan_token(TILDEEQUAL)) return true;
+  static final private boolean jj_3R_197() {
+    if (jj_3R_51()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_191() {
-    if (jj_3R_50()) return true;
+  static final private boolean jj_3R_196() {
+    if (jj_scan_token(NEW)) 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_73() {
-    if (jj_scan_token(DOTASSIGN)) return true;
+  static final private boolean jj_3R_195() {
+    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_72() {
-    if (jj_scan_token(ORASSIGN)) return true;
+  static final private boolean jj_3R_187() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_195()) {
+    jj_scanpos = xsp;
+    if (jj_3R_196()) {
+    jj_scanpos = xsp;
+    if (jj_3R_197()) 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_71() {
-    if (jj_scan_token(XORASSIGN)) return true;
+  static final private boolean jj_3R_77() {
+    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_190() {
-    if (jj_scan_token(NEW)) return true;
+  static final private boolean jj_3R_89() {
+    if (jj_scan_token(LIST)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_178()) return true;
+    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;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_105()) { jj_scanpos = xsp; break; }
+      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;
   }
 
-  static final private boolean jj_3R_70() {
-    if (jj_scan_token(ANDASSIGN)) return true;
+  static final private boolean jj_3R_76() {
+    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_69() {
-    if (jj_scan_token(RSIGNEDSHIFTASSIGN)) return true;
+  static final private boolean jj_3R_75() {
+    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_68() {
-    if (jj_scan_token(LSHIFTASSIGN)) return true;
+  static final private boolean jj_3R_74() {
+    if (jj_scan_token(XORASSIGN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_189() {
-    if (jj_scan_token(IDENTIFIER)) return true;
+  static final private boolean jj_3R_73() {
+    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_180() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_189()) {
-    jj_scanpos = xsp;
-    if (jj_3R_190()) {
-    jj_scanpos = xsp;
-    if (jj_3R_191()) return true;
+  static final private boolean jj_3R_72() {
+    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_67() {
+  static final private boolean jj_3R_71() {
+    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_70() {
     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_66() {
+  static final private boolean jj_3R_69() {
     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_65() {
+  static final private boolean jj_3R_68() {
     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_64() {
+  static final private boolean jj_3R_189() {
+    if (jj_scan_token(ARRAY)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_198()) 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(SLASHASSIGN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_63() {
+  static final private boolean jj_3R_66() {
     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_51() {
+  static final private boolean jj_3R_88() {
+    if (jj_scan_token(PRINT)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_46()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_65() {
+    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_52() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_62()) {
-    jj_scanpos = xsp;
-    if (jj_3R_63()) {
-    jj_scanpos = xsp;
-    if (jj_3R_64()) {
-    jj_scanpos = xsp;
     if (jj_3R_65()) {
     jj_scanpos = xsp;
     if (jj_3R_66()) {
@@ -6361,7 +6629,13 @@ final int startBlock, endBlock;
     jj_scanpos = xsp;
     if (jj_3R_73()) {
     jj_scanpos = xsp;
-    if (jj_3R_74()) return true;
+    if (jj_3R_74()) {
+    jj_scanpos = xsp;
+    if (jj_3R_75()) {
+    jj_scanpos = xsp;
+    if (jj_3R_76()) {
+    jj_scanpos = xsp;
+    if (jj_3R_77()) 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;
@@ -6378,189 +6652,91 @@ final int startBlock, endBlock;
     return false;
   }
 
-  static final private boolean jj_3R_62() {
-    if (jj_scan_token(ASSIGN)) return true;
+  static final private boolean jj_3_6() {
+    if (jj_3R_45()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_182() {
-    if (jj_scan_token(ARRAY)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_192()) return true;
+  static final private boolean jj_3R_178() {
+    if (jj_3R_189()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_171() {
-    if (jj_3R_182()) return true;
+  static final private boolean jj_3_5() {
+    if (jj_3R_45()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_181() {
-    if (jj_3R_188()) return true;
+  static final private boolean jj_3R_188() {
+    if (jj_3R_45()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_170() {
-    if (jj_3R_180()) return true;
+  static final private boolean jj_3R_177() {
+    if (jj_3R_187()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_181()) { jj_scanpos = xsp; break; }
+      if (jj_3R_188()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_179() {
-    if (jj_3R_188()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_101() {
-    if (jj_scan_token(ASSIGN)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+  static final private boolean jj_3R_186() {
     if (jj_3R_45()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
   static final private boolean jj_3R_42() {
-    if (jj_3R_50()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     if (jj_3R_51()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_45()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3_3() {
-    if (jj_3R_42()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3_5() {
-    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_3R_52()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_178()) return true;
+    if (jj_3R_46()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_179()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
     return false;
   }
 
-  static final private boolean jj_3R_166() {
+  static final private boolean jj_3R_173() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3_5()) {
+    if (jj_3_7()) {
     jj_scanpos = xsp;
-    if (jj_3R_170()) {
+    if (jj_3R_177()) {
     jj_scanpos = xsp;
-    if (jj_3R_171()) return true;
+    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_56() {
-    if (jj_3R_86()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_55() {
+  static final private boolean jj_3_3() {
     if (jj_3R_42()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_54() {
-    if (jj_3R_85()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_45() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_53()) {
-    jj_scanpos = xsp;
-    if (jj_3R_54()) {
-    jj_scanpos = xsp;
-    if (jj_3R_55()) {
-    jj_scanpos = xsp;
-    if (jj_3R_56()) 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_53() {
-    if (jj_3R_84()) 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(COMMA)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_50()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_194() {
-    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_193() {
-    if (jj_scan_token(INCR)) return true;
+  static final private boolean jj_3_7() {
+    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_185() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_193()) {
-    jj_scanpos = xsp;
-    if (jj_3R_194()) return true;
+    if (jj_scan_token(STATICCLASSACCESS)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_168() {
-    if (jj_3R_166()) return true;
+    if (jj_3R_185()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_185()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_99() {
-    if (jj_3R_50()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_186()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
     return false;
   }
 
@@ -6588,21 +6764,21 @@ final int startBlock, endBlock;
       jj_la1_4();
    }
    private static void jj_la1_0() {
-      jj_la1_0 = new int[] {0xfcb0001e,0x6,0x6,0xfcb0001e,0x0,0xfcb00000,0x0,0x600000,0x600000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x0,0x34000000,0x0,0x0,0x0,0x0,0x0,0x0,0x30000000,0x4000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x4000000,0x0,0x4000000,0x0,0x0,0x4000000,0x4000000,0x0,0x0,0x0,0x0,0x4000000,0x0,0x4000000,0x0,0x0,0x34000000,0x34000000,0x0,0x0,0x34000000,0x0,0x0,0xc4800000,0xfc800000,0x8,0x6,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0xfcb00010,0xfcb00010,0xfcb00000,0xf4b00000,0x0,0x0,0x0,0x0,0x4000000,0x0,0x0,0x0,0xf4b00010,0xf4b00010,0x8000000,0x0,0x34000000,0xfc800010,0xfc800010,0x1000000,0x2000000,0xfc800010,0x1000000,0x2000000,0xfc800010,0xfc800010,0xfc800010,0xfc800010,0xfc800010,0xfc800000,0xfc800000,0x4000000,0x34000000,0x4000000,0xfc800000,0xfc800000,0x4000000,0x0,0x34000000,0x34000000,};
+      jj_la1_0 = new int[] {0xf960001e,0x6,0x6,0xf960001e,0x0,0xf9600000,0x0,0xc00000,0xc00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x68000000,0x0,0x0,0x0,0x0,0x0,0x0,0x60000000,0x8000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x8000000,0x0,0x8000000,0x0,0x0,0x8000000,0x8000000,0x0,0x0,0x8000000,0x0,0x8000000,0x0,0x0,0x68000000,0x68000000,0x0,0x0,0x68000000,0x0,0x0,0x89000000,0x40000000,0x8000000,0xf9000000,0x8,0x6,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xf9600010,0xf9600010,0xf9600000,0xe9600000,0x0,0x0,0x0,0x0,0x8000000,0x0,0x0,0x0,0xe9600010,0xe9600010,0x10000000,0x0,0x68000000,0xf9000010,0xf9000010,0x2000000,0x4000000,0xf9000010,0x2000000,0x4000000,0xf9000010,0xf9000010,0xf9000010,0xf9000010,0xf9000010,0xf9000000,0xf9000000,0x8000000,0x68000000,0x8000000,0xf9000000,0xf9000000,0x8000000,0x0,0x68000000,0x68000000,};
    }
    private static void jj_la1_1() {
-      jj_la1_1 = new int[] {0x21d7541f,0x0,0x0,0x21d7541f,0x0,0x21d7541f,0x2000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc20000,0x80,0xc30000,0x0,0x0,0x0,0x0,0x0,0x80000000,0x0,0xc30000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc30000,0xc30000,0x0,0xc30000,0x0,0x0,0xc30000,0x80000000,0x0,0x0,0x20,0x20,0x10000,0x10000,0x10000,0x0,0x20,0x80c30000,0x80c30000,0x20,0xc20000,0xc30000,0x0,0x0,0x2115541f,0x21d7541f,0x0,0x0,0x7,0x0,0x0,0x0,0x0,0x0,0x0,0x21d7541f,0x21d7541f,0x21d7541f,0x21d7541f,0x0,0x0,0x0,0x0,0x10000,0x0,0x900,0x900,0x21d7541f,0x21d7541f,0x0,0x900,0xc30000,0x21d7541f,0x21d7541f,0x0,0x0,0x21d7541f,0x0,0x0,0x21d7541f,0x21d7541f,0x21d7541f,0x21d7541f,0x21d7541f,0x21d7541f,0x21d7541f,0x10000,0xc30000,0x10000,0x21d7541f,0x21d7541f,0x10000,0x0,0xc30000,0xc30000,};
+      jj_la1_1 = new int[] {0x875d507f,0x0,0x0,0x875d507f,0x0,0x875d507f,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3080000,0x200,0x30c0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x30c0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x30c0000,0x30c0000,0x0,0x30c0000,0x0,0x0,0x30c0000,0x0,0x0,0x0,0x40000,0x40000,0x40000,0x0,0x80,0x30c0000,0x30c0000,0x80,0x3080000,0x30c0000,0x0,0x0,0x8455507f,0x0,0x30c0000,0x875d507f,0x0,0x0,0xf,0x0,0x0,0x0,0x0,0x0,0x0,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x0,0x0,0x0,0x0,0x40000,0x0,0x2400,0x2400,0x875d507f,0x875d507f,0x0,0x2400,0x30c0000,0x875d507f,0x875d507f,0x0,0x0,0x875d507f,0x0,0x0,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x40000,0x30c0000,0x40000,0x875d507f,0x875d507f,0x40000,0x0,0x30c0000,0x30c0000,};
    }
    private static void jj_la1_2() {
-      jj_la1_2 = new int[] {0x804f0700,0x0,0x0,0x804f0700,0x0,0x804f0700,0x0,0x0,0x0,0x0,0x0,0x0,0x200,0x0,0x200,0x80000000,0x80000000,0x800c0000,0x0,0x804f0700,0x0,0x400000,0x0,0x400200,0x400000,0xff,0x0,0x804f0700,0x0,0x1000,0x20004000,0x20004000,0x40008000,0x40008000,0x0,0x800000,0x1000000,0x400000,0x0,0x0,0x0,0x0,0x1c000000,0x1c000000,0xc0000,0xc0000,0x2300000,0x2300000,0x804f0700,0x800f0700,0xc0000,0x800f0600,0x30000,0x400,0x80000200,0xff,0x30000,0x30000,0x0,0x0,0x200,0x200,0x200,0x200,0x0,0x804f07ff,0x804f07ff,0x0,0x80000000,0x804f0700,0x0,0x100,0x30300,0x804f0700,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x0,0x804f0700,0x804f0700,0x804f0700,0x804f0700,0x0,0x0,0x30000,0x30000,0x30200,0x2000,0x0,0x0,0x804f0700,0x804f0700,0x0,0x0,0x804f0700,0x804f0700,0x804f0700,0x0,0x0,0x804f0700,0x0,0x0,0x804f2700,0x804f0700,0x804f0700,0x804f0700,0x804f0700,0x804f0700,0x804f2700,0x30200,0x804f0700,0x30200,0x804f0700,0x804f2700,0x30200,0x0,0x804f0700,0x804f0700,};
+      jj_la1_2 = new int[] {0x13c1c00,0x0,0x0,0x13c1c00,0x0,0x13c1c00,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x800,0x0,0x0,0x300000,0x0,0x13c1c00,0x0,0x1000000,0x0,0x1000800,0x1000000,0x3fe,0x0,0x13c1c00,0x0,0x4000,0x80010000,0x80010000,0x20000,0x20000,0x0,0x2000000,0x4000000,0x1000000,0x0,0x0,0x0,0x0,0x70000000,0x70000000,0x300000,0x300000,0x8c00000,0x8c00000,0x13c1c00,0x3c1c00,0x300000,0x3c1800,0xc0000,0x1000,0x800,0x3fe,0xc0000,0xc0000,0x800,0x800,0x800,0x800,0x0,0x13c1ffe,0x13c1ffe,0x0,0x0,0x13c1c00,0x0,0x400,0xc0c00,0x0,0x13c1c00,0x13c1c00,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x13c1c00,0x13c1c00,0x13c1c00,0x13c1c00,0x0,0x0,0xc0000,0xc0000,0xc0800,0x8000,0x0,0x0,0x13c1c00,0x13c1c00,0x0,0x0,0x13c1c00,0x13c1c00,0x13c1c00,0x0,0x0,0x13c1c00,0x0,0x0,0x13c9c00,0x13c1c00,0x13c1c00,0x13c1c00,0x13c1c00,0x13c1c00,0x13c9c00,0xc0800,0x13c1c00,0xc0800,0x13c1c00,0x13c9c00,0xc0800,0x0,0x13c1c00,0x13c1c00,};
    }
    private static void jj_la1_3() {
-      jj_la1_3 = new int[] {0x8a228,0x0,0x0,0x8a228,0x80000,0x8a228,0x0,0x0,0x0,0x100000,0x80000000,0x8000,0x0,0x8000,0x8200,0x8,0x8,0x228,0x0,0x2228,0x100000,0x0,0x100000,0x0,0x0,0x0,0x0,0x2228,0x80000000,0x0,0x0,0x0,0x0,0x0,0x200000,0x0,0x0,0x0,0x79000000,0x79000000,0x6c00000,0x6c00000,0x0,0x0,0x0,0x0,0x0,0x0,0x2228,0x2228,0x0,0x2228,0x0,0x0,0x2228,0x0,0x0,0x0,0x22000,0x22000,0x200,0x200,0x200,0x200,0x22000,0x2228,0x2228,0x20000,0x28,0x2228,0x100000,0x0,0x88200,0x8a228,0x0,0x0,0x0,0x0,0x100000,0x80000000,0x100000,0x100000,0x100000,0x8a228,0x8a228,0x8a228,0x8a228,0x100000,0x80000000,0x80000000,0x80000000,0x200,0x8000,0x0,0x0,0x8a228,0x8a228,0x0,0x0,0x2228,0x8a228,0x8a228,0x0,0x0,0x8a228,0x0,0x0,0x8a228,0x8a228,0x8a228,0x8a228,0x8a228,0x8a228,0x8a228,0x200,0x2228,0x200,0x8a228,0x8a228,0x200,0x100000,0x2228,0x2228,};
+      jj_la1_3 = new int[] {0x2288a2,0x0,0x0,0x2288a2,0x200000,0x2288a2,0x0,0x0,0x0,0x400000,0x0,0x20000,0x0,0x20000,0x20800,0x22,0x22,0x8a2,0x0,0x88a2,0x400000,0x0,0x400000,0x0,0x0,0x0,0x0,0x88a2,0x0,0x0,0x0,0x0,0x1,0x1,0x800000,0x0,0x0,0x0,0xe4000000,0xe4000000,0x1b000000,0x1b000000,0x0,0x0,0x0,0x0,0x0,0x0,0x88a2,0x88a2,0x0,0x88a2,0x0,0x0,0x88a2,0x0,0x0,0x0,0x800,0x800,0x800,0x800,0x88000,0x88a2,0x88a2,0x80000,0xa2,0x88a2,0x400000,0x0,0x220800,0x0,0x88a2,0x2288a2,0x0,0x0,0x0,0x0,0x400000,0x0,0x400000,0x400000,0x400000,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x400000,0x0,0x0,0x0,0x800,0x20000,0x0,0x0,0x2288a2,0x2288a2,0x0,0x0,0x88a2,0x2288a2,0x2288a2,0x0,0x0,0x2288a2,0x0,0x0,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x800,0x88a2,0x800,0x2288a2,0x2288a2,0x800,0x400000,0x88a2,0x88a2,};
    }
    private static void jj_la1_4() {
-      jj_la1_4 = new int[] {0x1000,0x0,0x0,0x1000,0x0,0x1000,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x1000,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x1000,0xfff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x1000,0x0,0x1000,0x0,0x0,0x1000,0x0,0x0,0x0,0x0,0x0,0x1000,0x1000,0x1000,0x1000,0x0,0x1000,0x1000,0x0,0x0,0x1000,0x0,0x0,0x1000,0x1000,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x0,0x0,0x1000,0x1000,0x1000,0x1000,0x0,0x0,0xfff,0xfff,0x1000,0x0,0x0,0x0,0x1000,0x1000,0x0,0x0,0x1000,0x1000,0x1000,0x0,0x0,0x1000,0x0,0x0,0x1000,0x1000,0x1000,0x1000,0x1000,0x1000,0x1000,0x1000,0x1000,0x1000,0x1000,0x1000,0x1000,0x0,0x1000,0x1000,};
+      jj_la1_4 = new int[] {0x4000,0x0,0x0,0x4000,0x0,0x4000,0x0,0x0,0x0,0x0,0x2,0x0,0x4000,0x0,0x4000,0x0,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x4000,0x3ffe,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000,0x4000,0x0,0x4000,0x0,0x0,0x4000,0x0,0x0,0x0,0x4000,0x4000,0x4000,0x4000,0x0,0x4000,0x4000,0x0,0x0,0x4000,0x0,0x0,0x4000,0x0,0x4000,0x4000,0x0,0x0,0x0,0x4000,0x0,0x2,0x0,0x0,0x0,0x4000,0x4000,0x4000,0x4000,0x0,0x2,0x3ffe,0x3ffe,0x4000,0x0,0x0,0x0,0x4000,0x4000,0x0,0x0,0x4000,0x4000,0x4000,0x0,0x0,0x4000,0x0,0x0,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x0,0x4000,0x4000,};
    }
-  static final private JJCalls[] jj_2_rtns = new JJCalls[8];
+  static final private JJCalls[] jj_2_rtns = new JJCalls[11];
   static private boolean jj_rescan = false;
   static private int jj_gc = 0;
 
@@ -6788,8 +6964,8 @@ final int startBlock, endBlock;
 
   static public ParseException generateParseException() {
     jj_expentries.removeAllElements();
-    boolean[] la1tokens = new boolean[141];
-    for (int i = 0; i < 141; i++) {
+    boolean[] la1tokens = new boolean[143];
+    for (int i = 0; i < 143; i++) {
       la1tokens[i] = false;
     }
     if (jj_kind >= 0) {
@@ -6817,7 +6993,7 @@ final int startBlock, endBlock;
         }
       }
     }
-    for (int i = 0; i < 141; i++) {
+    for (int i = 0; i < 143; i++) {
       if (la1tokens[i]) {
         jj_expentry = new int[1];
         jj_expentry[0] = i;
@@ -6842,7 +7018,7 @@ final int startBlock, endBlock;
 
   static final private void jj_rescan_token() {
     jj_rescan = true;
-    for (int i = 0; i < 8; i++) {
+    for (int i = 0; i < 11; i++) {
       JJCalls p = jj_2_rtns[i];
       do {
         if (p.gen > jj_gen) {
@@ -6856,6 +7032,9 @@ final int startBlock, endBlock;
             case 5: jj_3_6(); break;
             case 6: jj_3_7(); break;
             case 7: jj_3_8(); break;
+            case 8: jj_3_9(); break;
+            case 9: jj_3_10(); break;
+            case 10: jj_3_11(); break;
           }
         }
         p = p.next;