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

diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.java b/net.sourceforge.phpeclipse/src/test/PHPParser.java
index 931b4b3..b0edb74 100644
--- a/net.sourceforge.phpeclipse/src/test/PHPParser.java
+++ b/net.sourceforge.phpeclipse/src/test/PHPParser.java
@@ -8,22 +8,21 @@ 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.*;
 import java.text.MessageFormat;
 
 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.PHPOutlineInfo;
-import net.sourceforge.phpdt.internal.compiler.parser.PHPSegmentWithChildren;
-import net.sourceforge.phpdt.internal.compiler.parser.PHPFunctionDeclaration;
-import net.sourceforge.phpdt.internal.compiler.parser.PHPClassDeclaration;
-import net.sourceforge.phpdt.internal.compiler.parser.PHPVarDeclaration;
-import net.sourceforge.phpdt.internal.compiler.parser.PHPReqIncDeclaration;
 
 /**
  * A new php parser.
- * This php parser is inspired by the Java 1.2 grammar example 
+ * This php parser is inspired by the Java 1.2 grammar example
  * given with JavaCC. You can get JavaCC at http://www.webgain.com
  * You can test the parser with the PHPParserTestCase2.java
  * @author Matthieu Casanova
@@ -33,12 +32,15 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
   /** The file that is parsed. */
   private static IFile fileToParse;
 
-  /** The current segment */
-  private static PHPSegmentWithChildren currentSegment;
+  /** The current segment. */
+  private static OutlineableWithChildren currentSegment;
 
   private static final String PARSE_ERROR_STRING = "Parse error"; //$NON-NLS-1$
   private static final String PARSE_WARNING_STRING = "Warning"; //$NON-NLS-1$
-  PHPOutlineInfo outlineInfo;
+  static PHPOutlineInfo outlineInfo;
+
+  public static MethodDeclaration currentFunction;
+  private static boolean assigning;
 
   /** The error level of the current ParseException. */
   private static int errorLevel = ERROR;
@@ -47,19 +49,107 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
 
   private static int errorStart = -1;
   private static int errorEnd = -1;
-
-  public PHPParser() {
-  }
+  private static PHPDocument phpDocument;
+  /**
+   * The point where html starts.
+   * It will be used by the token manager to create HTMLCode objects
+   */
+  public static int htmlStart;
+
+  //ast stack
+  private final static int AstStackIncrement = 100;
+  /** The stack of node. */
+  private static AstNode[] nodes;
+  /** The cursor in expression stack. */
+  private static int nodePtr;
+  private static VariableDeclaration[] variableDeclarationStack;
+  private static int variableDeclarationPtr;
+  private static Statement[] statementStack;
+  private static int statementPtr;
+  private static ElseIf[] elseIfStack;
+  private static int elseIfPtr;
 
   public final void setFileToParse(final IFile fileToParse) {
     this.fileToParse = fileToParse;
   }
 
+  public PHPParser() {
+  }
+
   public PHPParser(final IFile fileToParse) {
     this(new StringReader(""));
     this.fileToParse = fileToParse;
   }
 
+  /**
+   * Reinitialize the parser.
+   */
+  private static final void init() {
+    nodes = new AstNode[AstStackIncrement];
+    statementStack = new Statement[AstStackIncrement];
+    elseIfStack = new ElseIf[AstStackIncrement];
+    nodePtr = -1;
+    statementPtr = -1;
+    elseIfPtr = -1;
+    htmlStart = 0;
+  }
+
+  /**
+   * Add an php node on the stack.
+   * @param node the node that will be added to the stack
+   */
+  private static final void pushOnAstNodes(AstNode node) {
+    try {
+      nodes[++nodePtr] = node;
+    } catch (IndexOutOfBoundsException e) {
+      int oldStackLength = nodes.length;
+      AstNode[] oldStack = nodes;
+      nodes = new AstNode[oldStackLength + AstStackIncrement];
+      System.arraycopy(oldStack, 0, nodes, 0, oldStackLength);
+      nodePtr = oldStackLength;
+      nodes[nodePtr] = node;
+    }
+  }
+
+  private static final void pushOnVariableDeclarationStack(VariableDeclaration var) {
+    try {
+      variableDeclarationStack[++variableDeclarationPtr] = var;
+    } catch (IndexOutOfBoundsException e) {
+      int oldStackLength = variableDeclarationStack.length;
+      VariableDeclaration[] oldStack = variableDeclarationStack;
+      variableDeclarationStack = new VariableDeclaration[oldStackLength + AstStackIncrement];
+      System.arraycopy(oldStack, 0, variableDeclarationStack, 0, oldStackLength);
+      variableDeclarationPtr = oldStackLength;
+      variableDeclarationStack[variableDeclarationPtr] = var;
+    }
+  }
+
+  private static final void pushOnStatementStack(Statement statement) {
+    try {
+      statementStack[++statementPtr] = statement;
+    } catch (IndexOutOfBoundsException e) {
+      int oldStackLength = statementStack.length;
+      Statement[] oldStack = statementStack;
+      statementStack = new Statement[oldStackLength + AstStackIncrement];
+      System.arraycopy(oldStack, 0, statementStack, 0, oldStackLength);
+      statementPtr = oldStackLength;
+      statementStack[statementPtr] = statement;
+    }
+  }
+
+  private static final void pushOnElseIfStack(ElseIf elseIf) {
+    try {
+      elseIfStack[++elseIfPtr] = elseIf;
+    } catch (IndexOutOfBoundsException e) {
+      int oldStackLength = elseIfStack.length;
+      ElseIf[] oldStack = elseIfStack;
+      elseIfStack = new ElseIf[oldStackLength + AstStackIncrement];
+      System.arraycopy(oldStack, 0, elseIfStack, 0, oldStackLength);
+      elseIfPtr = oldStackLength;
+      elseIfStack[elseIfPtr] = elseIf;
+    }
+  }
+
   public static final void phpParserTester(final String strEval) throws CoreException, ParseException {
     PHPParserTokenManager.SwitchTo(PHPParserTokenManager.PHPPARSING);
     final StringReader stream = new StringReader(strEval);
@@ -67,6 +157,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
       jj_input_stream = new SimpleCharStream(stream, 1, 1);
     }
     ReInit(new StringReader(strEval));
+    init();
     phpTest();
   }
 
@@ -77,11 +168,10 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
         jj_input_stream = new SimpleCharStream(stream, 1, 1);
       }
       ReInit(stream);
+      init();
       phpFile();
     } catch (FileNotFoundException e) {
       e.printStackTrace();  //To change body of catch statement use Options | File Templates.
-    } catch (ParseException e) {
-      e.printStackTrace();  //To change body of catch statement use Options | File Templates.
     }
   }
 
@@ -91,19 +181,24 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
       jj_input_stream = new SimpleCharStream(stream, 1, 1);
     }
     ReInit(stream);
+    init();
     phpFile();
   }
 
   public final PHPOutlineInfo parseInfo(final Object parent, final String s) {
+    currentSegment = new PHPDocument(parent);
     outlineInfo = new PHPOutlineInfo(parent);
-    currentSegment = outlineInfo.getDeclarations();
     final StringReader stream = new StringReader(s);
     if (jj_input_stream == null) {
       jj_input_stream = new SimpleCharStream(stream, 1, 1);
     }
     ReInit(stream);
+    init();
     try {
       parse();
+      phpDocument = new PHPDocument(null);
+      phpDocument.nodes = nodes;
+      PHPeclipsePlugin.log(1,phpDocument.toString());
     } catch (ParseException e) {
       processParseException(e);
     }
@@ -226,6 +321,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
       jj_input_stream = new SimpleCharStream(stream, 1, 1);
     }
     ReInit(stream);
+    init();
     try {
       parse();
     } catch (ParseException e) {
@@ -255,13 +351,26 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
     }
   }
 
-  public static final void parse() throws ParseException {
+  /**
+   * Put a new html block in the stack.
+   */
+  public static final void createNewHTMLCode() {
+    final int currentPosition = SimpleCharStream.getPosition();
+    if (currentPosition == htmlStart) {
+      return;
+    }
+    final char[] chars = SimpleCharStream.currentBuffer.substring(htmlStart,currentPosition).toCharArray();
+    pushOnAstNodes(new HTMLCode(chars, htmlStart,currentPosition));
+  }
+
+  private static final void parse() throws ParseException {
           phpFile();
   }
 
   static final public void phpTest() throws ParseException {
     Php();
     jj_consume_token(0);
+   PHPParser.createNewHTMLCode();
   }
 
   static final public void phpFile() throws ParseException {
@@ -278,6 +387,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
         case IF:
         case ARRAY:
         case BREAK:
+        case LIST:
         case PRINT:
         case ECHO:
         case INCLUDE:
@@ -286,7 +396,6 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
         case REQUIRE_ONCE:
         case GLOBAL:
         case STATIC:
-        case LIST:
         case CONTINUE:
         case DO:
         case FOR:
@@ -298,13 +407,6 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
         case FALSE:
         case WHILE:
         case FOREACH:
-        case INTEGER_LITERAL:
-        case FLOATING_POINT_LITERAL:
-        case STRING_LITERAL:
-        case IDENTIFIER:
-        case LPAREN:
-        case LBRACE:
-        case SEMICOLON:
         case AT:
         case DOLLAR:
         case BANG:
@@ -313,6 +415,13 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
         case PLUS:
         case MINUS:
         case BIT_AND:
+        case INTEGER_LITERAL:
+        case FLOATING_POINT_LITERAL:
+        case STRING_LITERAL:
+        case IDENTIFIER:
+        case LPAREN:
+        case LBRACE:
+        case SEMICOLON:
         case DOLLAR_ID:
           ;
           break;
@@ -324,27 +433,25 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
       }
       jj_consume_token(0);
     } catch (TokenMgrError e) {
+    PHPeclipsePlugin.log(e);
+    errorStart   = SimpleCharStream.getPosition();
+    errorEnd     = errorStart + 1;
     errorMessage = e.getMessage();
     errorLevel   = ERROR;
     {if (true) throw generateParseException();}
     }
   }
 
+/**
+ * A php block is a <?= expression [;]?>
+ * or <?php somephpcode ?>
+ * or <? somephpcode ?>
+ */
   static final public void PhpBlock() throws ParseException {
   final int start = jj_input_stream.getPosition();
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case PHPECHOSTART:
-      jj_consume_token(PHPECHOSTART);
-      Expression();
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case SEMICOLON:
-        jj_consume_token(SEMICOLON);
-        break;
-      default:
-        jj_la1[1] = jj_gen;
-        ;
-      }
-      jj_consume_token(PHPEND);
+      phpEchoBlock();
       break;
     case PHPSTARTSHORT:
     case PHPSTARTLONG:
@@ -354,6 +461,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
     case IF:
     case ARRAY:
     case BREAK:
+    case LIST:
     case PRINT:
     case ECHO:
     case INCLUDE:
@@ -362,7 +470,6 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
     case REQUIRE_ONCE:
     case GLOBAL:
     case STATIC:
-    case LIST:
     case CONTINUE:
     case DO:
     case FOR:
@@ -374,13 +481,6 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
     case FALSE:
     case WHILE:
     case FOREACH:
-    case INTEGER_LITERAL:
-    case FLOATING_POINT_LITERAL:
-    case STRING_LITERAL:
-    case IDENTIFIER:
-    case LPAREN:
-    case LBRACE:
-    case SEMICOLON:
     case AT:
     case DOLLAR:
     case BANG:
@@ -389,6 +489,13 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
     case PLUS:
     case MINUS:
     case BIT_AND:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case STRING_LITERAL:
+    case IDENTIFIER:
+    case LPAREN:
+    case LBRACE:
+    case SEMICOLON:
     case DOLLAR_ID:
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case PHPSTARTSHORT:
@@ -411,13 +518,13 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
     }
           break;
         default:
-          jj_la1[2] = jj_gen;
+          jj_la1[1] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
         break;
       default:
-        jj_la1[3] = jj_gen;
+        jj_la1[2] = jj_gen;
         ;
       }
       Php();
@@ -432,12 +539,33 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
       }
       break;
     default:
-      jj_la1[4] = jj_gen;
+      jj_la1[3] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
   }
 
+  static final public PHPEchoBlock phpEchoBlock() throws ParseException {
+  final Expression expr;
+  final int pos = SimpleCharStream.getPosition();
+  PHPEchoBlock echoBlock;
+    jj_consume_token(PHPECHOSTART);
+    expr = Expression();
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case SEMICOLON:
+      jj_consume_token(SEMICOLON);
+      break;
+    default:
+      jj_la1[4] = jj_gen;
+      ;
+    }
+    jj_consume_token(PHPEND);
+  echoBlock = new PHPEchoBlock(expr,pos,SimpleCharStream.getPosition());
+  pushOnAstNodes(echoBlock);
+  {if (true) return echoBlock;}
+    throw new Error("Missing return statement in function");
+  }
+
   static final public void Php() throws ParseException {
     label_2:
     while (true) {
@@ -447,6 +575,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
       case IF:
       case ARRAY:
       case BREAK:
+      case LIST:
       case PRINT:
       case ECHO:
       case INCLUDE:
@@ -455,7 +584,6 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
       case REQUIRE_ONCE:
       case GLOBAL:
       case STATIC:
-      case LIST:
       case CONTINUE:
       case DO:
       case FOR:
@@ -467,13 +595,6 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
       case FALSE:
       case WHILE:
       case FOREACH:
-      case INTEGER_LITERAL:
-      case FLOATING_POINT_LITERAL:
-      case STRING_LITERAL:
-      case IDENTIFIER:
-      case LPAREN:
-      case LBRACE:
-      case SEMICOLON:
       case AT:
       case DOLLAR:
       case BANG:
@@ -482,6 +603,13 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
       case PLUS:
       case MINUS:
       case BIT_AND:
+      case INTEGER_LITERAL:
+      case FLOATING_POINT_LITERAL:
+      case STRING_LITERAL:
+      case IDENTIFIER:
+      case LPAREN:
+      case LBRACE:
+      case SEMICOLON:
       case DOLLAR_ID:
         ;
         break;
@@ -493,9 +621,10 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
     }
   }
 
-  static final public void ClassDeclaration() throws ParseException {
-  final PHPClassDeclaration classDeclaration;
+  static final public ClassDeclaration ClassDeclaration() throws ParseException {
+  final ClassDeclaration classDeclaration;
   final Token className;
+  Token superclassName = null;
   final int pos;
     jj_consume_token(CLASS);
     try {
@@ -504,15 +633,15 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
     } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
+    errorStart   = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+    errorEnd     = jj_input_stream.getPosition() + 1;
     {if (true) throw e;}
     }
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case EXTENDS:
       jj_consume_token(EXTENDS);
       try {
-        jj_consume_token(IDENTIFIER);
+        superclassName = jj_consume_token(IDENTIFIER);
       } catch (ParseException e) {
       errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected";
       errorLevel   = ERROR;
@@ -525,18 +654,29 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
       jj_la1[6] = jj_gen;
       ;
     }
-    if (currentSegment != null) {
-      classDeclaration = new PHPClassDeclaration(currentSegment,className.image,pos);
+    if (superclassName == null) {
+      classDeclaration = new ClassDeclaration(currentSegment,
+                                              className.image.toCharArray(),
+                                              pos,
+                                              0);
+    } else {
+      classDeclaration = new ClassDeclaration(currentSegment,
+                                              className.image.toCharArray(),
+                                              superclassName.image.toCharArray(),
+                                              pos,
+                                              0);
+    }
       currentSegment.add(classDeclaration);
       currentSegment = classDeclaration;
-    }
-    ClassBody();
-    if (currentSegment != null) {
-      currentSegment = (PHPSegmentWithChildren) currentSegment.getParent();
-    }
+    ClassBody(classDeclaration);
+   currentSegment = (OutlineableWithChildren) currentSegment.getParent();
+   classDeclaration.sourceEnd = SimpleCharStream.getPosition();
+   pushOnAstNodes(classDeclaration);
+   {if (true) return classDeclaration;}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void ClassBody() throws ParseException {
+  static final public void ClassBody(ClassDeclaration classDeclaration) throws ParseException {
     try {
       jj_consume_token(LBRACE);
     } catch (ParseException e) {
@@ -557,7 +697,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
         jj_la1[7] = jj_gen;
         break label_3;
       }
-      ClassBodyDeclaration();
+      ClassBodyDeclaration(classDeclaration);
     }
     try {
       jj_consume_token(RBRACE);
@@ -570,13 +710,20 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
     }
   }
 
-  static final public void ClassBodyDeclaration() throws ParseException {
+/**
+ * A class can contain only methods and fields.
+ */
+  static final public void ClassBodyDeclaration(ClassDeclaration classDeclaration) throws ParseException {
+  MethodDeclaration method;
+  FieldDeclaration field;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case FUNCTION:
-      MethodDeclaration();
+      method = MethodDeclaration();
+                                classDeclaration.addMethod(method);
       break;
     case VAR:
-      FieldDeclaration();
+      field = FieldDeclaration();
+                                classDeclaration.addVariable(field);
       break;
     default:
       jj_la1[8] = jj_gen;
@@ -585,13 +732,19 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
     }
   }
 
-  static final public void FieldDeclaration() throws ParseException {
-  PHPVarDeclaration variableDeclaration;
+/**
+ * A class field declaration : it's var VariableDeclarator() (, VariableDeclarator())*;.
+ */
+  static final public FieldDeclaration FieldDeclaration() throws ParseException {
+  VariableDeclaration variableDeclaration;
+  VariableDeclaration[] list;
+  final ArrayList arrayList = new ArrayList();
+  final int pos = SimpleCharStream.getPosition();
     jj_consume_token(VAR);
     variableDeclaration = VariableDeclarator();
-    if (currentSegment != null) {
-      currentSegment.add(variableDeclaration);
-    }
+   arrayList.add(variableDeclaration);
+   outlineInfo.addVariable(new String(variableDeclaration.name));
+   currentSegment.add(variableDeclaration);
     label_4:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -604,32 +757,37 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
       }
       jj_consume_token(COMMA);
       variableDeclaration = VariableDeclarator();
-      if (currentSegment != null) {
-        currentSegment.add(variableDeclaration);
-      }
+       arrayList.add(variableDeclaration);
+       outlineInfo.addVariable(new String(variableDeclaration.name));
+       currentSegment.add(variableDeclaration);
     }
     try {
       jj_consume_token(SEMICOLON);
     } catch (ParseException e) {
-    errorMessage = "';' expected after variable declaration";
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected after variable declaration";
     errorLevel   = ERROR;
     errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd   = jj_input_stream.getPosition() + 1;
     {if (true) throw e;}
     }
+   list = new VariableDeclaration[arrayList.size()];
+   arrayList.toArray(list);
+   {if (true) return new FieldDeclaration(list,
+                               pos,
+                               SimpleCharStream.getPosition());}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public PHPVarDeclaration VariableDeclarator() throws ParseException {
-  final String varName;
-  final String varValue;
+  static final public VariableDeclaration VariableDeclarator() throws ParseException {
+  final String varName, varValue;
+  Expression initializer = null;
   final int pos = jj_input_stream.getPosition();
     varName = VariableDeclaratorId();
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case ASSIGN:
       jj_consume_token(ASSIGN);
       try {
-        varValue = VariableInitializer();
-       {if (true) return new PHPVarDeclaration(currentSegment,varName,pos,varValue);}
+        initializer = VariableInitializer();
       } catch (ParseException e) {
       errorMessage = "Literal expression expected in variable initializer";
       errorLevel   = ERROR;
@@ -642,16 +800,32 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
       jj_la1[10] = jj_gen;
       ;
     }
-   {if (true) return new PHPVarDeclaration(currentSegment,varName,pos);}
+  if (initializer == null) {
+    {if (true) return new VariableDeclaration(currentSegment,
+                                  varName.toCharArray(),
+                                  pos,
+                                  jj_input_stream.getPosition());}
+  }
+    {if (true) return new VariableDeclaration(currentSegment,
+                                    varName.toCharArray(),
+                                    initializer,
+                                    pos);}
     throw new Error("Missing return statement in function");
   }
 
+/**
+ * A Variable name.
+ * @return the variable name (with suffix)
+ */
   static final public String VariableDeclaratorId() throws ParseException {
   String expr;
+  Expression expression;
   final StringBuffer buff = new StringBuffer();
+  final int pos = SimpleCharStream.getPosition();
+  ConstantIdentifier ex;
     try {
       expr = Variable();
-     buff.append(expr);
+                         buff.append(expr);
       label_5:
       while (true) {
         if (jj_2_1(2)) {
@@ -659,8 +833,11 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
         } else {
           break label_5;
         }
-        expr = VariableSuffix();
-     buff.append(expr);
+       ex = new ConstantIdentifier(expr.toCharArray(),
+                                   pos,
+                                   SimpleCharStream.getPosition());
+        expression = VariableSuffix(ex);
+       buff.append(expression.toStringExpression());
       }
      {if (true) return buff.toString();}
     } catch (ParseException e) {
@@ -674,30 +851,36 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
   }
 
   static final public String Variable() throws ParseException {
-  String expr = null;
+  final StringBuffer buff;
+  Expression expression = null;
   final Token token;
+  final String expr;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case DOLLAR_ID:
       token = jj_consume_token(DOLLAR_ID);
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case LBRACE:
         jj_consume_token(LBRACE);
-        expr = Expression();
+        expression = Expression();
         jj_consume_token(RBRACE);
         break;
       default:
         jj_la1[11] = jj_gen;
         ;
       }
-    if (expr == null) {
-      {if (true) return token.image;}
+    if (expression == null && !assigning) {
+      {if (true) return token.image.substring(1);}
     }
-    {if (true) return token + "{" + expr + "}";}
+    buff = new StringBuffer(token.image);
+    buff.append('{');
+    buff.append(expression.toStringExpression());
+    buff.append('}');
+    {if (true) return buff.toString();}
       break;
     case DOLLAR:
       jj_consume_token(DOLLAR);
       expr = VariableName();
-   {if (true) return "$" + expr;}
+   {if (true) return expr;}
       break;
     default:
       jj_la1[12] = jj_gen;
@@ -708,40 +891,51 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
   }
 
   static final public String VariableName() throws ParseException {
-String expr = null;
-final Token token;
+  final StringBuffer buff;
+  String expr = null;
+  Expression expression = null;
+  final Token token;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case LBRACE:
       jj_consume_token(LBRACE);
-      expr = Expression();
+      expression = Expression();
       jj_consume_token(RBRACE);
-   {if (true) return "{"+expr+"}";}
+   buff = new StringBuffer('{');
+   buff.append(expression.toStringExpression());
+   buff.append('}');
+   {if (true) return buff.toString();}
       break;
     case IDENTIFIER:
       token = jj_consume_token(IDENTIFIER);
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case LBRACE:
         jj_consume_token(LBRACE);
-        expr = Expression();
+        expression = Expression();
         jj_consume_token(RBRACE);
         break;
       default:
         jj_la1[13] = jj_gen;
         ;
       }
-    if (expr == null) {
+    if (expression == null) {
       {if (true) return token.image;}
     }
-    {if (true) return token + "{" + expr + "}";}
+    buff = new StringBuffer(token.image);
+    buff.append('{');
+    buff.append(expression.toStringExpression());
+    buff.append('}');
+    {if (true) return buff.toString();}
       break;
     case DOLLAR:
       jj_consume_token(DOLLAR);
       expr = VariableName();
-   {if (true) return "$" + expr;}
+    buff = new StringBuffer('$');
+    buff.append(expr);
+    {if (true) return buff.toString();}
       break;
     case DOLLAR_ID:
       token = jj_consume_token(DOLLAR_ID);
-   {if (true) return token.image + expr;}
+                       {if (true) return token.image;}
       break;
     default:
       jj_la1[14] = jj_gen;
@@ -751,9 +945,10 @@ final Token token;
     throw new Error("Missing return statement in function");
   }
 
-  static final public String VariableInitializer() throws ParseException {
-  final String expr;
+  static final public Expression VariableInitializer() throws ParseException {
+  final Expression expr;
   final Token token;
+  final int pos = SimpleCharStream.getPosition();
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case NULL:
     case TRUE:
@@ -778,7 +973,11 @@ final Token token;
         jj_consume_token(-1);
         throw new ParseException();
       }
-   {if (true) return "-" + token.image;}
+   {if (true) return new PrefixedUnaryExpression(new NumberLiteral(token.image.toCharArray(),
+                                                        pos,
+                                                        SimpleCharStream.getPosition()),
+                                      OperatorIds.MINUS,
+                                      pos);}
       break;
     case PLUS:
       jj_consume_token(PLUS);
@@ -794,7 +993,11 @@ final Token token;
         jj_consume_token(-1);
         throw new ParseException();
       }
-   {if (true) return "+" + token.image;}
+   {if (true) return new PrefixedUnaryExpression(new NumberLiteral(token.image.toCharArray(),
+                                                        pos,
+                                                        SimpleCharStream.getPosition()),
+                                      OperatorIds.PLUS,
+                                      pos);}
       break;
     case ARRAY:
       expr = ArrayDeclarator();
@@ -802,7 +1005,7 @@ final Token token;
       break;
     case IDENTIFIER:
       token = jj_consume_token(IDENTIFIER);
-   {if (true) return token.image;}
+   {if (true) return new ConstantIdentifier(token.image.toCharArray(),pos,SimpleCharStream.getPosition());}
       break;
     default:
       jj_la1[17] = jj_gen;
@@ -812,42 +1015,35 @@ final Token token;
     throw new Error("Missing return statement in function");
   }
 
-  static final public String ArrayVariable() throws ParseException {
-String expr;
-final StringBuffer buff = new StringBuffer();
+  static final public ArrayVariableDeclaration ArrayVariable() throws ParseException {
+Expression expr,expr2;
     expr = Expression();
-   buff.append(expr);
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case ARRAYASSIGN:
       jj_consume_token(ARRAYASSIGN);
-      expr = Expression();
-    buff.append("=>").append(expr);
+      expr2 = Expression();
+   {if (true) return new ArrayVariableDeclaration(expr,expr2);}
       break;
     default:
       jj_la1[18] = jj_gen;
       ;
     }
-   {if (true) return buff.toString();}
+   {if (true) return new ArrayVariableDeclaration(expr,SimpleCharStream.getPosition());}
     throw new Error("Missing return statement in function");
   }
 
-  static final public String ArrayInitializer() throws ParseException {
-String expr;
-final StringBuffer buff = new StringBuffer("(");
+  static final public ArrayVariableDeclaration[] ArrayInitializer() throws ParseException {
+  ArrayVariableDeclaration expr;
+  final ArrayList list = new ArrayList();
     jj_consume_token(LPAREN);
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case ARRAY:
-    case PRINT:
     case LIST:
+    case PRINT:
     case NEW:
     case NULL:
     case TRUE:
     case FALSE:
-    case INTEGER_LITERAL:
-    case FLOATING_POINT_LITERAL:
-    case STRING_LITERAL:
-    case IDENTIFIER:
-    case LPAREN:
     case AT:
     case DOLLAR:
     case BANG:
@@ -856,9 +1052,14 @@ final StringBuffer buff = new StringBuffer("(");
     case PLUS:
     case MINUS:
     case BIT_AND:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case STRING_LITERAL:
+    case IDENTIFIER:
+    case LPAREN:
     case DOLLAR_ID:
       expr = ArrayVariable();
-             buff.append(expr);
+             list.add(expr);
       label_6:
       while (true) {
         if (jj_2_2(2)) {
@@ -868,24 +1069,41 @@ final StringBuffer buff = new StringBuffer("(");
         }
         jj_consume_token(COMMA);
         expr = ArrayVariable();
-             buff.append(",").append(expr);
+             list.add(expr);
       }
       break;
     default:
       jj_la1[19] = jj_gen;
       ;
     }
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case COMMA:
+      jj_consume_token(COMMA);
+                     list.add(null);
+      break;
+    default:
+      jj_la1[20] = jj_gen;
+      ;
+    }
     jj_consume_token(RPAREN);
-    buff.append(")");
-    {if (true) return buff.toString();}
+  ArrayVariableDeclaration[] vars = new ArrayVariableDeclaration[list.size()];
+  list.toArray(vars);
+  {if (true) return vars;}
     throw new Error("Missing return statement in function");
   }
 
-  static final public void MethodDeclaration() throws ParseException {
-  final PHPFunctionDeclaration functionDeclaration;
-    jj_consume_token(FUNCTION);
+/**
+ * A Method Declaration.
+ * <b>function</b> MetodDeclarator() Block()
+ */
+  static final public MethodDeclaration MethodDeclaration() throws ParseException {
+  final MethodDeclaration functionDeclaration;
+  Token functionToken;
+  final Block block;
+    functionToken = jj_consume_token(FUNCTION);
     try {
       functionDeclaration = MethodDeclarator();
+     outlineInfo.addVariable(new String(functionDeclaration.name));
     } catch (ParseException e) {
     if (errorMessage != null) {
       {if (true) throw e;}
@@ -900,45 +1118,59 @@ final StringBuffer buff = new StringBuffer("(");
       currentSegment.add(functionDeclaration);
       currentSegment = functionDeclaration;
     }
-    Block();
+    currentFunction = functionDeclaration;
+    block = Block();
+    functionDeclaration.statements = block.statements;
+    currentFunction = null;
     if (currentSegment != null) {
-      currentSegment = (PHPSegmentWithChildren) currentSegment.getParent();
+      currentSegment = (OutlineableWithChildren) currentSegment.getParent();
     }
+    {if (true) return functionDeclaration;}
+    throw new Error("Missing return statement in function");
   }
 
 /**
- * A MethodDeclarator contains [&] IDENTIFIER(parameters ...).
+ * A MethodDeclarator.
+ * [&] IDENTIFIER(parameters ...).
  * @return a function description for the outline
  */
-  static final public PHPFunctionDeclaration MethodDeclarator() throws ParseException {
+  static final public MethodDeclaration MethodDeclarator() throws ParseException {
   final Token identifier;
-  final StringBuffer methodDeclaration = new StringBuffer();
-  final String formalParameters;
-  final int pos = jj_input_stream.getPosition();
+  Token reference = null;
+  final Hashtable formalParameters;
+  final int pos = SimpleCharStream.getPosition();
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case BIT_AND:
-      jj_consume_token(BIT_AND);
-               methodDeclaration.append("&");
+      reference = jj_consume_token(BIT_AND);
       break;
     default:
-      jj_la1[20] = jj_gen;
+      jj_la1[21] = jj_gen;
       ;
     }
     identifier = jj_consume_token(IDENTIFIER);
-   methodDeclaration.append(identifier);
     formalParameters = FormalParameters();
-    methodDeclaration.append(formalParameters);
-    {if (true) return new PHPFunctionDeclaration(currentSegment,methodDeclaration.toString(),pos);}
+   {if (true) return new MethodDeclaration(currentSegment,
+                                 identifier.image.toCharArray(),
+                                 formalParameters,
+                                 reference != null,
+                                 pos,
+                                 SimpleCharStream.getPosition());}
     throw new Error("Missing return statement in function");
   }
 
-  static final public String FormalParameters() throws ParseException {
+/**
+ * FormalParameters follows method identifier.
+ * (FormalParameter())
+ */
+  static final public Hashtable FormalParameters() throws ParseException {
   String expr;
   final StringBuffer buff = new StringBuffer("(");
+  VariableDeclaration var;
+  final Hashtable parameters = new Hashtable();
     try {
       jj_consume_token(LPAREN);
     } catch (ParseException e) {
-    errorMessage = "Formal parameter expected after function identifier";
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected after function identifier";
     errorLevel   = ERROR;
     errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd   = jj_input_stream.getPosition() + 1;
@@ -948,8 +1180,8 @@ final StringBuffer buff = new StringBuffer("(");
     case DOLLAR:
     case BIT_AND:
     case DOLLAR_ID:
-      expr = FormalParameter();
-               buff.append(expr);
+      var = FormalParameter();
+               parameters.put(new String(var.name),var);
       label_7:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -957,16 +1189,16 @@ final StringBuffer buff = new StringBuffer("(");
           ;
           break;
         default:
-          jj_la1[21] = jj_gen;
+          jj_la1[22] = jj_gen;
           break label_7;
         }
         jj_consume_token(COMMA);
-        expr = FormalParameter();
-                 buff.append(",").append(expr);
+        var = FormalParameter();
+                 parameters.put(new String(var.name),var);
       }
       break;
     default:
-      jj_la1[22] = jj_gen;
+      jj_la1[23] = jj_gen;
       ;
     }
     try {
@@ -978,214 +1210,245 @@ final StringBuffer buff = new StringBuffer("(");
     errorEnd   = jj_input_stream.getPosition() + 1;
     {if (true) throw e;}
     }
-  buff.append(")");
-  {if (true) return buff.toString();}
+  {if (true) return parameters;}
     throw new Error("Missing return statement in function");
   }
 
-  static final public String FormalParameter() throws ParseException {
-  final PHPVarDeclaration variableDeclaration;
-  final StringBuffer buff = new StringBuffer();
+/**
+ * A formal parameter.
+ * $varname[=value] (,$varname[=value])
+ */
+  static final public VariableDeclaration FormalParameter() throws ParseException {
+  final VariableDeclaration variableDeclaration;
+  Token token = null;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case BIT_AND:
-      jj_consume_token(BIT_AND);
-              buff.append("&");
+      token = jj_consume_token(BIT_AND);
       break;
     default:
-      jj_la1[23] = jj_gen;
+      jj_la1[24] = jj_gen;
       ;
     }
     variableDeclaration = VariableDeclarator();
-    buff.append(variableDeclaration.toString());
-    {if (true) return buff.toString();}
+    if (token != null) {
+      variableDeclaration.setReference(true);
+    }
+    {if (true) return variableDeclaration;}
     throw new Error("Missing return statement in function");
   }
 
-  static final public String Type() throws ParseException {
+  static final public ConstantIdentifier Type() throws ParseException {
+ final int pos;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case STRING:
       jj_consume_token(STRING);
-   {if (true) return "string";}
+                        pos = SimpleCharStream.getPosition();
+                        {if (true) return new ConstantIdentifier(Types.STRING,
+                                        pos,pos-6);}
       break;
     case BOOL:
       jj_consume_token(BOOL);
-   {if (true) return "bool";}
+                        pos = SimpleCharStream.getPosition();
+                        {if (true) return new ConstantIdentifier(Types.BOOL,
+                                        pos,pos-4);}
       break;
     case BOOLEAN:
       jj_consume_token(BOOLEAN);
-   {if (true) return "boolean";}
+                        pos = SimpleCharStream.getPosition();
+                        {if (true) return new ConstantIdentifier(Types.BOOLEAN,
+                                        pos,pos-7);}
       break;
     case REAL:
       jj_consume_token(REAL);
-   {if (true) return "real";}
+                        pos = SimpleCharStream.getPosition();
+                        {if (true) return new ConstantIdentifier(Types.REAL,
+                                        pos,pos-4);}
       break;
     case DOUBLE:
       jj_consume_token(DOUBLE);
-   {if (true) return "double";}
+                        pos = SimpleCharStream.getPosition();
+                        {if (true) return new ConstantIdentifier(Types.DOUBLE,
+                                        pos,pos-5);}
       break;
     case FLOAT:
       jj_consume_token(FLOAT);
-   {if (true) return "float";}
+                        pos = SimpleCharStream.getPosition();
+                        {if (true) return new ConstantIdentifier(Types.FLOAT,
+                                        pos,pos-5);}
       break;
     case INT:
       jj_consume_token(INT);
-   {if (true) return "int";}
+                        pos = SimpleCharStream.getPosition();
+                        {if (true) return new ConstantIdentifier(Types.INT,
+                                        pos,pos-3);}
       break;
     case INTEGER:
       jj_consume_token(INTEGER);
-   {if (true) return "integer";}
+                        pos = SimpleCharStream.getPosition();
+                        {if (true) return new ConstantIdentifier(Types.INTEGER,
+                                        pos,pos-7);}
       break;
     case OBJECT:
       jj_consume_token(OBJECT);
-   {if (true) return "object";}
+                        pos = SimpleCharStream.getPosition();
+                        {if (true) return new ConstantIdentifier(Types.OBJECT,
+                                        pos,pos-6);}
       break;
     default:
-      jj_la1[24] = jj_gen;
+      jj_la1[25] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
     throw new Error("Missing return statement in function");
   }
 
-  static final public String Expression() throws ParseException {
-  final String expr;
-  final String assignOperator;
-  final String expr2;
+  static final public Expression Expression() throws ParseException {
+  final Expression expr;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case PRINT:
       expr = PrintExpression();
-   {if (true) return expr;}
+                                  {if (true) return expr;}
       break;
     case LIST:
       expr = ListExpression();
-   {if (true) return expr;}
+                                  {if (true) return expr;}
       break;
-    case ARRAY:
-    case NEW:
-    case NULL:
-    case TRUE:
-    case FALSE:
-    case INTEGER_LITERAL:
-    case FLOATING_POINT_LITERAL:
-    case STRING_LITERAL:
-    case IDENTIFIER:
-    case LPAREN:
-    case AT:
-    case DOLLAR:
-    case BANG:
-    case INCR:
-    case DECR:
-    case PLUS:
-    case MINUS:
-    case BIT_AND:
-    case DOLLAR_ID:
-      expr = ConditionalExpression();
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case ASSIGN:
-      case PLUSASSIGN:
-      case MINUSASSIGN:
-      case STARASSIGN:
-      case SLASHASSIGN:
-      case ANDASSIGN:
-      case ORASSIGN:
-      case XORASSIGN:
-      case DOTASSIGN:
-      case REMASSIGN:
-      case TILDEEQUAL:
-      case LSHIFTASSIGN:
-      case RSIGNEDSHIFTASSIGN:
-        assignOperator = AssignmentOperator();
-        try {
-          expr2 = Expression();
-       {if (true) return expr + assignOperator + expr2;}
-        } catch (ParseException e) {
+    default:
+      jj_la1[26] = jj_gen;
+      if (jj_2_3(2147483647)) {
+        expr = varAssignation();
+                                  {if (true) return expr;}
+      } 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 INCR:
+        case DECR:
+        case PLUS:
+        case MINUS:
+        case BIT_AND:
+        case INTEGER_LITERAL:
+        case FLOATING_POINT_LITERAL:
+        case STRING_LITERAL:
+        case IDENTIFIER:
+        case LPAREN:
+        case DOLLAR_ID:
+          expr = ConditionalExpression();
+                                  {if (true) return expr;}
+          break;
+        default:
+          jj_la1[27] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
+      }
+    }
+    throw new Error("Missing return statement in function");
+  }
+
+/**
+ * A Variable assignation.
+ * varName (an assign operator) any expression
+ */
+  static final public VarAssignation varAssignation() throws ParseException {
+  String varName;
+  final Expression expression;
+  final int assignOperator;
+  final int pos = SimpleCharStream.getPosition();
+    varName = VariableDeclaratorId();
+    assignOperator = AssignmentOperator();
+    try {
+      expression = Expression();
+    } catch (ParseException e) {
+      if (errorMessage != null) {
+        {if (true) throw e;}
+      }
       errorMessage = "expression expected";
       errorLevel   = ERROR;
       errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
       errorEnd   = jj_input_stream.getPosition() + 1;
       {if (true) throw e;}
-        }
-        break;
-      default:
-        jj_la1[25] = jj_gen;
-        ;
-      }
-   {if (true) return expr;}
-      break;
-    default:
-      jj_la1[26] = jj_gen;
-      jj_consume_token(-1);
-      throw new ParseException();
     }
+     {if (true) return new VarAssignation(varName.toCharArray(),
+                               expression,
+                               assignOperator,
+                               pos,
+                               SimpleCharStream.getPosition());}
     throw new Error("Missing return statement in function");
   }
 
-  static final public String AssignmentOperator() throws ParseException {
+  static final public int AssignmentOperator() throws ParseException {
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case ASSIGN:
       jj_consume_token(ASSIGN);
- {if (true) return "=";}
+                        {if (true) return VarAssignation.EQUAL;}
       break;
     case STARASSIGN:
       jj_consume_token(STARASSIGN);
- {if (true) return "*=";}
+                        {if (true) return VarAssignation.STAR_EQUAL;}
       break;
     case SLASHASSIGN:
       jj_consume_token(SLASHASSIGN);
- {if (true) return "/=";}
+                        {if (true) return VarAssignation.SLASH_EQUAL;}
       break;
     case REMASSIGN:
       jj_consume_token(REMASSIGN);
- {if (true) return "%=";}
+                        {if (true) return VarAssignation.REM_EQUAL;}
       break;
     case PLUSASSIGN:
       jj_consume_token(PLUSASSIGN);
- {if (true) return "+=";}
+                        {if (true) return VarAssignation.PLUS_EQUAL;}
       break;
     case MINUSASSIGN:
       jj_consume_token(MINUSASSIGN);
- {if (true) return "-=";}
+                        {if (true) return VarAssignation.MINUS_EQUAL;}
       break;
     case LSHIFTASSIGN:
       jj_consume_token(LSHIFTASSIGN);
- {if (true) return "<<=";}
+                        {if (true) return VarAssignation.LSHIFT_EQUAL;}
       break;
     case RSIGNEDSHIFTASSIGN:
       jj_consume_token(RSIGNEDSHIFTASSIGN);
- {if (true) return ">>=";}
+                        {if (true) return VarAssignation.RSIGNEDSHIFT_EQUAL;}
       break;
     case ANDASSIGN:
       jj_consume_token(ANDASSIGN);
- {if (true) return "&=";}
+                        {if (true) return VarAssignation.AND_EQUAL;}
       break;
     case XORASSIGN:
       jj_consume_token(XORASSIGN);
- {if (true) return "|=";}
+                        {if (true) return VarAssignation.XOR_EQUAL;}
       break;
     case ORASSIGN:
       jj_consume_token(ORASSIGN);
- {if (true) return "|=";}
+                        {if (true) return VarAssignation.OR_EQUAL;}
       break;
     case DOTASSIGN:
       jj_consume_token(DOTASSIGN);
- {if (true) return ".=";}
+                        {if (true) return VarAssignation.DOT_EQUAL;}
       break;
     case TILDEEQUAL:
       jj_consume_token(TILDEEQUAL);
- {if (true) return "~=";}
+                        {if (true) return VarAssignation.TILDE_EQUAL;}
       break;
     default:
-      jj_la1[27] = jj_gen;
+      jj_la1[28] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
     throw new Error("Missing return statement in function");
   }
 
-  static final public String ConditionalExpression() throws ParseException {
-  final String expr;
-  String expr2 = null;
-  String expr3 = null;
+  static final public Expression ConditionalExpression() throws ParseException {
+  final Expression expr;
+  Expression expr2 = null;
+  Expression expr3 = null;
     expr = ConditionalOrExpression();
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case HOOK:
@@ -1195,96 +1458,91 @@ final StringBuffer buff = new StringBuffer("(");
       expr3 = ConditionalExpression();
       break;
     default:
-      jj_la1[28] = jj_gen;
+      jj_la1[29] = jj_gen;
       ;
     }
   if (expr3 == null) {
     {if (true) return expr;}
-  } else {
-    {if (true) return expr + "?" + expr2 + ":" + expr3;}
   }
+  {if (true) return new ConditionalExpression(expr,expr2,expr3);}
     throw new Error("Missing return statement in function");
   }
 
-  static final public String ConditionalOrExpression() throws ParseException {
-  String expr;
-  Token operator;
-  final StringBuffer buff = new StringBuffer();
+  static final public Expression ConditionalOrExpression() throws ParseException {
+  Expression expr,expr2;
+  int operator;
     expr = ConditionalAndExpression();
-   buff.append(expr);
     label_8:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case OR_OR:
       case _ORL:
-      case SC_OR:
         ;
         break;
       default:
-        jj_la1[29] = jj_gen;
+        jj_la1[30] = jj_gen;
         break label_8;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case SC_OR:
-        operator = jj_consume_token(SC_OR);
+      case OR_OR:
+        jj_consume_token(OR_OR);
+                 operator = OperatorIds.OR_OR;
         break;
       case _ORL:
-        operator = jj_consume_token(_ORL);
+        jj_consume_token(_ORL);
+                 operator = OperatorIds.ORL;
         break;
       default:
-        jj_la1[30] = jj_gen;
+        jj_la1[31] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
-      expr = ConditionalAndExpression();
-      buff.append(operator.image);
-      buff.append(expr);
+      expr2 = ConditionalAndExpression();
+      expr = new BinaryExpression(expr,expr2,operator);
     }
-    {if (true) return buff.toString();}
+   {if (true) return expr;}
     throw new Error("Missing return statement in function");
   }
 
-  static final public String ConditionalAndExpression() throws ParseException {
-  String expr;
-  Token operator;
-  final StringBuffer buff = new StringBuffer();
+  static final public Expression ConditionalAndExpression() throws ParseException {
+  Expression expr,expr2;
+  int operator;
     expr = ConcatExpression();
-   buff.append(expr);
     label_9:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case AND_AND:
       case _ANDL:
-      case SC_AND:
         ;
         break;
       default:
-        jj_la1[31] = jj_gen;
+        jj_la1[32] = jj_gen;
         break label_9;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case SC_AND:
-        operator = jj_consume_token(SC_AND);
+      case AND_AND:
+        jj_consume_token(AND_AND);
+                operator = OperatorIds.AND_AND;
         break;
       case _ANDL:
-        operator = jj_consume_token(_ANDL);
+        jj_consume_token(_ANDL);
+                operator = OperatorIds.ANDL;
         break;
       default:
-        jj_la1[32] = jj_gen;
+        jj_la1[33] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
-      expr = ConcatExpression();
-      buff.append(operator.image);
-      buff.append(expr);
+      expr2 = ConcatExpression();
+                               expr = new BinaryExpression(expr,expr2,operator);
     }
-   {if (true) return buff.toString();}
+   {if (true) return expr;}
     throw new Error("Missing return statement in function");
   }
 
-  static final public String ConcatExpression() throws ParseException {
-  String expr;
-  final StringBuffer buff = new StringBuffer();
+  static final public Expression ConcatExpression() throws ParseException {
+  Expression expr,expr2;
     expr = InclusiveOrExpression();
-   buff.append(expr);
     label_10:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1292,22 +1550,20 @@ final StringBuffer buff = new StringBuffer("(");
         ;
         break;
       default:
-        jj_la1[33] = jj_gen;
+        jj_la1[34] = jj_gen;
         break label_10;
       }
       jj_consume_token(DOT);
-      expr = InclusiveOrExpression();
-   buff.append(".").append(expr);
+      expr2 = InclusiveOrExpression();
+     expr = new BinaryExpression(expr,expr2,OperatorIds.DOT);
     }
-   {if (true) return buff.toString();}
+   {if (true) return expr;}
     throw new Error("Missing return statement in function");
   }
 
-  static final public String InclusiveOrExpression() throws ParseException {
-  String expr;
-  final StringBuffer buff = new StringBuffer();
+  static final public Expression InclusiveOrExpression() throws ParseException {
+  Expression expr,expr2;
     expr = ExclusiveOrExpression();
-   buff.append(expr);
     label_11:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1315,22 +1571,20 @@ final StringBuffer buff = new StringBuffer("(");
         ;
         break;
       default:
-        jj_la1[34] = jj_gen;
+        jj_la1[35] = jj_gen;
         break label_11;
       }
       jj_consume_token(BIT_OR);
-      expr = ExclusiveOrExpression();
-   buff.append("|").append(expr);
+      expr2 = ExclusiveOrExpression();
+    expr = new BinaryExpression(expr,expr2,OperatorIds.OR);
     }
-   {if (true) return buff.toString();}
+   {if (true) return expr;}
     throw new Error("Missing return statement in function");
   }
 
-  static final public String ExclusiveOrExpression() throws ParseException {
-  String expr;
-  final StringBuffer buff = new StringBuffer();
+  static final public Expression ExclusiveOrExpression() throws ParseException {
+  Expression expr,expr2;
     expr = AndExpression();
-    buff.append(expr);
     label_12:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1338,23 +1592,20 @@ final StringBuffer buff = new StringBuffer("(");
         ;
         break;
       default:
-        jj_la1[35] = jj_gen;
+        jj_la1[36] = jj_gen;
         break label_12;
       }
       jj_consume_token(XOR);
-      expr = AndExpression();
-    buff.append("^");
-    buff.append(expr);
+      expr2 = AndExpression();
+     expr = new BinaryExpression(expr,expr2,OperatorIds.XOR);
     }
-    {if (true) return buff.toString();}
+   {if (true) return expr;}
     throw new Error("Missing return statement in function");
   }
 
-  static final public String AndExpression() throws ParseException {
-  String expr;
-  final StringBuffer buff = new StringBuffer();
+  static final public Expression AndExpression() throws ParseException {
+  Expression expr,expr2;
     expr = EqualityExpression();
-    buff.append(expr);
     label_13:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1362,80 +1613,83 @@ final StringBuffer buff = new StringBuffer("(");
         ;
         break;
       default:
-        jj_la1[36] = jj_gen;
+        jj_la1[37] = jj_gen;
         break label_13;
       }
       jj_consume_token(BIT_AND);
-      expr = EqualityExpression();
-    buff.append("&").append(expr);
+      expr2 = EqualityExpression();
+     expr = new BinaryExpression(expr,expr2,OperatorIds.AND);
     }
-   {if (true) return buff.toString();}
+   {if (true) return expr;}
     throw new Error("Missing return statement in function");
   }
 
-  static final public String EqualityExpression() throws ParseException {
-  String expr;
-  Token operator;
-  final StringBuffer buff = new StringBuffer();
+  static final public Expression EqualityExpression() throws ParseException {
+  Expression expr,expr2;
+  int operator;
     expr = RelationalExpression();
-   buff.append(expr);
     label_14:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case EQ:
-      case NE:
+      case EQUAL_EQUAL:
+      case NOT_EQUAL:
       case DIF:
       case BANGDOUBLEEQUAL:
       case TRIPLEEQUAL:
         ;
         break;
       default:
-        jj_la1[37] = jj_gen;
+        jj_la1[38] = jj_gen;
         break label_14;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case EQ:
-        operator = jj_consume_token(EQ);
+      case EQUAL_EQUAL:
+        jj_consume_token(EQUAL_EQUAL);
+                          operator = OperatorIds.EQUAL_EQUAL;
         break;
       case DIF:
-        operator = jj_consume_token(DIF);
+        jj_consume_token(DIF);
+                          operator = OperatorIds.DIF;
         break;
-      case NE:
-        operator = jj_consume_token(NE);
+      case NOT_EQUAL:
+        jj_consume_token(NOT_EQUAL);
+                          operator = OperatorIds.DIF;
         break;
       case BANGDOUBLEEQUAL:
-        operator = jj_consume_token(BANGDOUBLEEQUAL);
+        jj_consume_token(BANGDOUBLEEQUAL);
+                          operator = OperatorIds.BANG_EQUAL_EQUAL;
         break;
       case TRIPLEEQUAL:
-        operator = jj_consume_token(TRIPLEEQUAL);
+        jj_consume_token(TRIPLEEQUAL);
+                          operator = OperatorIds.EQUAL_EQUAL_EQUAL;
         break;
       default:
-        jj_la1[38] = jj_gen;
+        jj_la1[39] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
       try {
-        expr = RelationalExpression();
+        expr2 = RelationalExpression();
       } catch (ParseException e) {
-    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected after '"+operator.image+"'";
+    if (errorMessage != null) {
+      {if (true) throw e;}
+    }
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected";
     errorLevel   = ERROR;
     errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd   = jj_input_stream.getPosition() + 1;
     {if (true) throw e;}
       }
-    buff.append(operator.image);
-    buff.append(expr);
+    expr = new BinaryExpression(expr,expr2,operator);
     }
-   {if (true) return buff.toString();}
+   {if (true) return expr;}
     throw new Error("Missing return statement in function");
   }
 
-  static final public String RelationalExpression() throws ParseException {
-  String expr;
-  Token operator;
-  final StringBuffer buff = new StringBuffer();
+  static final public Expression RelationalExpression() throws ParseException {
+  Expression expr,expr2;
+  int operator;
     expr = ShiftExpression();
-   buff.append(expr);
     label_15:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1446,40 +1700,42 @@ final StringBuffer buff = new StringBuffer("(");
         ;
         break;
       default:
-        jj_la1[39] = jj_gen;
+        jj_la1[40] = jj_gen;
         break label_15;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case LT:
-        operator = jj_consume_token(LT);
+        jj_consume_token(LT);
+          operator = OperatorIds.LESS;
         break;
       case GT:
-        operator = jj_consume_token(GT);
+        jj_consume_token(GT);
+          operator = OperatorIds.GREATER;
         break;
       case LE:
-        operator = jj_consume_token(LE);
+        jj_consume_token(LE);
+          operator = OperatorIds.LESS_EQUAL;
         break;
       case GE:
-        operator = jj_consume_token(GE);
+        jj_consume_token(GE);
+          operator = OperatorIds.GREATER_EQUAL;
         break;
       default:
-        jj_la1[40] = jj_gen;
+        jj_la1[41] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
-      expr = ShiftExpression();
-   buff.append(operator.image).append(expr);
+      expr2 = ShiftExpression();
+   expr = new BinaryExpression(expr,expr2,operator);
     }
-   {if (true) return buff.toString();}
+   {if (true) return expr;}
     throw new Error("Missing return statement in function");
   }
 
-  static final public String ShiftExpression() throws ParseException {
-  String expr;
-  Token operator;
-  final StringBuffer buff = new StringBuffer();
+  static final public Expression ShiftExpression() throws ParseException {
+  Expression expr,expr2;
+  int operator;
     expr = AdditiveExpression();
-   buff.append(expr);
     label_16:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1489,38 +1745,38 @@ final StringBuffer buff = new StringBuffer("(");
         ;
         break;
       default:
-        jj_la1[41] = jj_gen;
+        jj_la1[42] = jj_gen;
         break label_16;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case LSHIFT:
-        operator = jj_consume_token(LSHIFT);
+        jj_consume_token(LSHIFT);
+                      operator = OperatorIds.LEFT_SHIFT;
         break;
       case RSIGNEDSHIFT:
-        operator = jj_consume_token(RSIGNEDSHIFT);
+        jj_consume_token(RSIGNEDSHIFT);
+                      operator = OperatorIds.RIGHT_SHIFT;
         break;
       case RUNSIGNEDSHIFT:
-        operator = jj_consume_token(RUNSIGNEDSHIFT);
+        jj_consume_token(RUNSIGNEDSHIFT);
+                      operator = OperatorIds.UNSIGNED_RIGHT_SHIFT;
         break;
       default:
-        jj_la1[42] = jj_gen;
+        jj_la1[43] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
-      expr = AdditiveExpression();
-    buff.append(operator.image);
-    buff.append(expr);
+      expr2 = AdditiveExpression();
+   expr = new BinaryExpression(expr,expr2,operator);
     }
-   {if (true) return buff.toString();}
+   {if (true) return expr;}
     throw new Error("Missing return statement in function");
   }
 
-  static final public String AdditiveExpression() throws ParseException {
-  String expr;
-  Token operator;
-  final StringBuffer buff = new StringBuffer();
+  static final public Expression AdditiveExpression() throws ParseException {
+  Expression expr,expr2;
+  int operator;
     expr = MultiplicativeExpression();
-   buff.append(expr);
     label_17:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1529,163 +1785,187 @@ final StringBuffer buff = new StringBuffer("(");
         ;
         break;
       default:
-        jj_la1[43] = jj_gen;
+        jj_la1[44] = jj_gen;
         break label_17;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case PLUS:
-        operator = jj_consume_token(PLUS);
+        jj_consume_token(PLUS);
+              operator = OperatorIds.PLUS;
         break;
       case MINUS:
-        operator = jj_consume_token(MINUS);
+        jj_consume_token(MINUS);
+              operator = OperatorIds.MINUS;
         break;
       default:
-        jj_la1[44] = jj_gen;
+        jj_la1[45] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
-      expr = MultiplicativeExpression();
-    buff.append(operator.image);
-    buff.append(expr);
+      expr2 = MultiplicativeExpression();
+   expr = new BinaryExpression(expr,expr2,operator);
     }
-   {if (true) return buff.toString();}
+   {if (true) return expr;}
     throw new Error("Missing return statement in function");
   }
 
-  static final public String MultiplicativeExpression() throws ParseException {
-  String expr;
-  Token operator;
-  final StringBuffer buff = new StringBuffer();
+  static final public Expression MultiplicativeExpression() throws ParseException {
+  Expression expr,expr2;
+  int operator;
     try {
       expr = UnaryExpression();
     } catch (ParseException e) {
+    if (errorMessage != null) {
+      {if (true) throw e;}
+    }
     errorMessage = "unexpected token '"+e.currentToken.next.image+"'";
     errorLevel   = ERROR;
     errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd   = jj_input_stream.getPosition() + 1;
     {if (true) throw e;}
     }
-   buff.append(expr);
     label_18:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case STAR:
       case SLASH:
-      case REM:
+      case REMAINDER:
         ;
         break;
       default:
-        jj_la1[45] = jj_gen;
+        jj_la1[46] = jj_gen;
         break label_18;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case STAR:
-        operator = jj_consume_token(STAR);
+        jj_consume_token(STAR);
+                   operator = OperatorIds.MULTIPLY;
         break;
       case SLASH:
-        operator = jj_consume_token(SLASH);
+        jj_consume_token(SLASH);
+                   operator = OperatorIds.DIVIDE;
         break;
-      case REM:
-        operator = jj_consume_token(REM);
+      case REMAINDER:
+        jj_consume_token(REMAINDER);
+                   operator = OperatorIds.REMAINDER;
         break;
       default:
-        jj_la1[46] = jj_gen;
+        jj_la1[47] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
-      expr = UnaryExpression();
-    buff.append(operator.image);
-    buff.append(expr);
+      expr2 = UnaryExpression();
+     expr = new BinaryExpression(expr,expr2,operator);
     }
-   {if (true) return buff.toString();}
+   {if (true) return expr;}
     throw new Error("Missing return statement in function");
   }
 
 /**
  * An unary expression starting with @, & or nothing
  */
-  static final public String UnaryExpression() throws ParseException {
-  final String expr;
-  final Token token;
-  final StringBuffer buff = new StringBuffer();
+  static final public Expression UnaryExpression() throws ParseException {
+  Expression expr;
+  final int pos = SimpleCharStream.getPosition();
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case BIT_AND:
-      token = jj_consume_token(BIT_AND);
+      jj_consume_token(BIT_AND);
       expr = UnaryExpressionNoPrefix();
-    if (token == null) {
-      {if (true) return expr;}
-    }
-    {if (true) return token.image + expr;}
+   {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.AND,pos);}
       break;
     case ARRAY:
     case NEW:
     case NULL:
     case TRUE:
     case FALSE:
+    case AT:
+    case DOLLAR:
+    case BANG:
+    case INCR:
+    case DECR:
+    case PLUS:
+    case MINUS:
     case INTEGER_LITERAL:
     case FLOATING_POINT_LITERAL:
     case STRING_LITERAL:
     case IDENTIFIER:
     case LPAREN:
+    case DOLLAR_ID:
+      expr = AtUnaryExpression();
+   {if (true) return expr;}
+      break;
+    default:
+      jj_la1[48] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    throw new Error("Missing return statement in function");
+  }
+
+  static final public Expression AtUnaryExpression() throws ParseException {
+  Expression expr;
+  final int pos = SimpleCharStream.getPosition();
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case AT:
+      jj_consume_token(AT);
+      expr = AtUnaryExpression();
+   {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.AT,pos);}
+      break;
+    case ARRAY:
+    case NEW:
+    case NULL:
+    case TRUE:
+    case FALSE:
     case DOLLAR:
     case BANG:
     case INCR:
     case DECR:
     case PLUS:
     case MINUS:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case STRING_LITERAL:
+    case IDENTIFIER:
+    case LPAREN:
     case DOLLAR_ID:
-      label_19:
-      while (true) {
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-        case AT:
-          ;
-          break;
-        default:
-          jj_la1[47] = jj_gen;
-          break label_19;
-        }
-        jj_consume_token(AT);
-         buff.append("@");
-      }
       expr = UnaryExpressionNoPrefix();
-   {if (true) return buff.append(expr).toString();}
+   {if (true) return expr;}
       break;
     default:
-      jj_la1[48] = jj_gen;
+      jj_la1[49] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
     throw new Error("Missing return statement in function");
   }
 
-  static final public String UnaryExpressionNoPrefix() throws ParseException {
-  final String expr;
-  final Token token;
+  static final public Expression UnaryExpressionNoPrefix() throws ParseException {
+  Expression expr;
+  int operator;
+  final int pos = SimpleCharStream.getPosition();
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case PLUS:
     case MINUS:
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case PLUS:
-        token = jj_consume_token(PLUS);
+        jj_consume_token(PLUS);
+              operator = OperatorIds.PLUS;
         break;
       case MINUS:
-        token = jj_consume_token(MINUS);
+        jj_consume_token(MINUS);
+              operator = OperatorIds.MINUS;
         break;
       default:
-        jj_la1[49] = jj_gen;
+        jj_la1[50] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
       expr = UnaryExpression();
-    {if (true) return token.image + expr;}
+   {if (true) return new PrefixedUnaryExpression(expr,operator,pos);}
       break;
     case INCR:
-      expr = PreIncrementExpression();
-   {if (true) return expr;}
-      break;
     case DECR:
-      expr = PreDecrementExpression();
+      expr = PreIncDecExpression();
    {if (true) return expr;}
       break;
     case ARRAY:
@@ -1693,63 +1973,71 @@ final StringBuffer buff = new StringBuffer("(");
     case NULL:
     case TRUE:
     case FALSE:
+    case DOLLAR:
+    case BANG:
     case INTEGER_LITERAL:
     case FLOATING_POINT_LITERAL:
     case STRING_LITERAL:
     case IDENTIFIER:
     case LPAREN:
-    case DOLLAR:
-    case BANG:
     case DOLLAR_ID:
       expr = UnaryExpressionNotPlusMinus();
    {if (true) return expr;}
       break;
     default:
-      jj_la1[50] = jj_gen;
+      jj_la1[51] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
     throw new Error("Missing return statement in function");
   }
 
-  static final public String PreIncrementExpression() throws ParseException {
-final String expr;
-    jj_consume_token(INCR);
-    expr = PrimaryExpression();
-   {if (true) return "++"+expr;}
-    throw new Error("Missing return statement in function");
-  }
-
-  static final public String PreDecrementExpression() throws ParseException {
-final String expr;
-    jj_consume_token(DECR);
+  static final public Expression PreIncDecExpression() throws ParseException {
+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;
+      break;
+    case DECR:
+      jj_consume_token(DECR);
+             operator = OperatorIds.MINUS_MINUS;
+      break;
+    default:
+      jj_la1[52] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
     expr = PrimaryExpression();
-   {if (true) return "--"+expr;}
+   {if (true) return new PrefixedUnaryExpression(expr,operator,pos);}
     throw new Error("Missing return statement in function");
   }
 
-  static final public String UnaryExpressionNotPlusMinus() throws ParseException {
-  final String expr;
+  static final public Expression UnaryExpressionNotPlusMinus() throws ParseException {
+  Expression expr;
+  final int pos = SimpleCharStream.getPosition();
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case BANG:
       jj_consume_token(BANG);
       expr = UnaryExpression();
-   {if (true) return "!" + expr;}
+                                   {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);}
       break;
     default:
-      jj_la1[51] = jj_gen;
-      if (jj_2_3(2147483647)) {
+      jj_la1[53] = jj_gen;
+      if (jj_2_4(2147483647)) {
         expr = CastExpression();
-   {if (true) return expr;}
+                                   {if (true) return expr;}
       } else {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case ARRAY:
         case NEW:
-        case IDENTIFIER:
         case DOLLAR:
+        case IDENTIFIER:
         case DOLLAR_ID:
           expr = PostfixExpression();
-   {if (true) return expr;}
+                                   {if (true) return expr;}
           break;
         case NULL:
         case TRUE:
@@ -1758,7 +2046,7 @@ final String expr;
         case FLOATING_POINT_LITERAL:
         case STRING_LITERAL:
           expr = Literal();
-   {if (true) return expr;}
+                                   {if (true) return expr;}
           break;
         case LPAREN:
           jj_consume_token(LPAREN);
@@ -1768,14 +2056,14 @@ final String expr;
           } catch (ParseException e) {
     errorMessage = "')' expected";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
+    errorStart   = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+    errorEnd     = jj_input_stream.getPosition() + 1;
     {if (true) throw e;}
           }
-   {if (true) return "("+expr+")";}
+   {if (true) return expr;}
           break;
         default:
-          jj_la1[52] = jj_gen;
+          jj_la1[54] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -1784,57 +2072,87 @@ final String expr;
     throw new Error("Missing return statement in function");
   }
 
-  static final public String CastExpression() throws ParseException {
-final String type, expr;
+  static final public CastExpression CastExpression() throws ParseException {
+final ConstantIdentifier type;
+final Expression expr;
+final int pos = SimpleCharStream.getPosition();
     jj_consume_token(LPAREN);
-    type = Type();
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case STRING:
+    case OBJECT:
+    case BOOL:
+    case BOOLEAN:
+    case REAL:
+    case DOUBLE:
+    case FLOAT:
+    case INT:
+    case INTEGER:
+      type = Type();
+      break;
+    case ARRAY:
+      jj_consume_token(ARRAY);
+             type = new ConstantIdentifier(Types.ARRAY,pos,SimpleCharStream.getPosition());
+      break;
+    default:
+      jj_la1[55] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
     jj_consume_token(RPAREN);
     expr = UnaryExpression();
-   {if (true) return "(" + type + ")" + expr;}
+   {if (true) return new CastExpression(type,expr,pos,SimpleCharStream.getPosition());}
     throw new Error("Missing return statement in function");
   }
 
-  static final public String PostfixExpression() throws ParseException {
-  final String expr;
-  Token operator = null;
+  static final public Expression PostfixExpression() throws ParseException {
+  Expression expr;
+  int operator = -1;
+  final int pos = SimpleCharStream.getPosition();
     expr = PrimaryExpression();
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case INCR:
     case DECR:
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case INCR:
-        operator = jj_consume_token(INCR);
+        jj_consume_token(INCR);
+            operator = OperatorIds.PLUS_PLUS;
         break;
       case DECR:
-        operator = jj_consume_token(DECR);
+        jj_consume_token(DECR);
+            operator = OperatorIds.MINUS_MINUS;
         break;
       default:
-        jj_la1[53] = jj_gen;
+        jj_la1[56] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
       break;
     default:
-      jj_la1[54] = jj_gen;
+      jj_la1[57] = jj_gen;
       ;
     }
-    if (operator == null) {
+    if (operator == -1) {
       {if (true) return expr;}
     }
-    {if (true) return expr + operator.image;}
+    {if (true) return new PostfixedUnaryExpression(expr,operator,pos);}
     throw new Error("Missing return statement in function");
   }
 
-  static final public String PrimaryExpression() throws ParseException {
+  static final public Expression PrimaryExpression() throws ParseException {
   final Token identifier;
-  String expr;
+  Expression expr;
   final StringBuffer buff = new StringBuffer();
-    if (jj_2_4(2)) {
+  final int pos = SimpleCharStream.getPosition();
+    if (jj_2_5(2)) {
       identifier = jj_consume_token(IDENTIFIER);
       jj_consume_token(STATICCLASSACCESS);
       expr = ClassIdentifier();
-   buff.append(identifier.image).append("::").append(expr);
-      label_20:
+   expr = new ClassAccess(new ConstantIdentifier(identifier.image.toCharArray(),
+                                                 pos,
+                                                 SimpleCharStream.getPosition()),
+                          expr,
+                          ClassAccess.STATIC);
+      label_19:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case CLASSACCESS:
@@ -1843,22 +2161,20 @@ final String type, expr;
           ;
           break;
         default:
-          jj_la1[55] = jj_gen;
-          break label_20;
+          jj_la1[58] = jj_gen;
+          break label_19;
         }
-        expr = PrimarySuffix();
-   buff.append(expr);
+        expr = PrimarySuffix(expr);
       }
-   {if (true) return buff.toString();}
+   {if (true) return expr;}
     } else {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case NEW:
-      case IDENTIFIER:
       case DOLLAR:
+      case IDENTIFIER:
       case DOLLAR_ID:
         expr = PrimaryPrefix();
-                           buff.append(expr);
-        label_21:
+        label_20:
         while (true) {
           switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
           case CLASSACCESS:
@@ -1867,20 +2183,19 @@ final String type, expr;
             ;
             break;
           default:
-            jj_la1[56] = jj_gen;
-            break label_21;
+            jj_la1[59] = jj_gen;
+            break label_20;
           }
-          expr = PrimarySuffix();
-                             buff.append(expr);
+          expr = PrimarySuffix(expr);
         }
-   {if (true) return buff.toString();}
+   {if (true) return expr;}
         break;
       case ARRAY:
         expr = ArrayDeclarator();
-   {if (true) return "array" + expr;}
+   {if (true) return expr;}
         break;
       default:
-        jj_la1[57] = jj_gen;
+        jj_la1[60] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -1888,106 +2203,128 @@ final String type, expr;
     throw new Error("Missing return statement in function");
   }
 
-  static final public String ArrayDeclarator() throws ParseException {
-  final String expr;
+  static final public ArrayInitializer ArrayDeclarator() throws ParseException {
+  final ArrayVariableDeclaration[] vars;
+  final int pos = SimpleCharStream.getPosition();
     jj_consume_token(ARRAY);
-    expr = ArrayInitializer();
-   {if (true) return "array" + expr;}
+    vars = ArrayInitializer();
+   {if (true) return new ArrayInitializer(vars,pos,SimpleCharStream.getPosition());}
     throw new Error("Missing return statement in function");
   }
 
-  static final public String PrimaryPrefix() throws ParseException {
-  final String expr;
+  static final public Expression PrimaryPrefix() throws ParseException {
+  final Expression expr;
   final Token token;
+  final String var;
+  final int pos = SimpleCharStream.getPosition();
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case IDENTIFIER:
       token = jj_consume_token(IDENTIFIER);
-   {if (true) return token.image;}
+                                  {if (true) return new ConstantIdentifier(token.image.toCharArray(),
+                                                                pos,
+                                                                SimpleCharStream.getPosition());}
       break;
     case NEW:
       jj_consume_token(NEW);
       expr = ClassIdentifier();
-    {if (true) return "new " + expr;}
+                                  {if (true) return new PrefixedUnaryExpression(expr,
+                                                                     OperatorIds.NEW,
+                                                                     pos);}
       break;
     case DOLLAR:
     case DOLLAR_ID:
-      expr = VariableDeclaratorId();
-   {if (true) return expr;}
+      var = VariableDeclaratorId();
+                                 {if (true) return new ConstantIdentifier(var.toCharArray(),
+                                                               pos,
+                                                               SimpleCharStream.getPosition());}
       break;
     default:
-      jj_la1[58] = jj_gen;
+      jj_la1[61] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
     throw new Error("Missing return statement in function");
   }
 
-  static final public String classInstantiation() throws ParseException {
-  String expr;
-  final StringBuffer buff = new StringBuffer("new ");
+  static final public PrefixedUnaryExpression classInstantiation() throws ParseException {
+  Expression expr;
+  final StringBuffer buff;
+  final int pos = SimpleCharStream.getPosition();
     jj_consume_token(NEW);
     expr = ClassIdentifier();
-   buff.append(expr);
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case ARRAY:
     case NEW:
-    case IDENTIFIER:
     case DOLLAR:
+    case IDENTIFIER:
     case DOLLAR_ID:
+     buff = new StringBuffer(expr.toStringExpression());
       expr = PrimaryExpression();
-     buff.append(expr);
+     buff.append(expr.toStringExpression());
+    expr = new ConstantIdentifier(buff.toString().toCharArray(),
+                                  pos,
+                                  SimpleCharStream.getPosition());
       break;
     default:
-      jj_la1[59] = jj_gen;
+      jj_la1[62] = jj_gen;
       ;
     }
-   {if (true) return buff.toString();}
+   {if (true) return new PrefixedUnaryExpression(expr,
+                                      OperatorIds.NEW,
+                                      pos);}
     throw new Error("Missing return statement in function");
   }
 
-  static final public String ClassIdentifier() throws ParseException {
+  static final public ConstantIdentifier ClassIdentifier() throws ParseException {
   final String expr;
   final Token token;
+  final int pos = SimpleCharStream.getPosition();
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case IDENTIFIER:
       token = jj_consume_token(IDENTIFIER);
-   {if (true) return token.image;}
+                                 {if (true) return new ConstantIdentifier(token.image.toCharArray(),
+                                                               pos,
+                                                               SimpleCharStream.getPosition());}
       break;
     case DOLLAR:
     case DOLLAR_ID:
       expr = VariableDeclaratorId();
-   {if (true) return expr;}
+                                 {if (true) return new ConstantIdentifier(expr.toCharArray(),
+                                                               pos,
+                                                               SimpleCharStream.getPosition());}
       break;
     default:
-      jj_la1[60] = jj_gen;
+      jj_la1[63] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
     throw new Error("Missing return statement in function");
   }
 
-  static final public String PrimarySuffix() throws ParseException {
-  final String expr;
+  static final public AbstractSuffixExpression PrimarySuffix(Expression prefix) throws ParseException {
+  final AbstractSuffixExpression expr;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case LPAREN:
-      expr = Arguments();
-   {if (true) return expr;}
+      expr = Arguments(prefix);
+                                 {if (true) return expr;}
       break;
     case CLASSACCESS:
     case LBRACKET:
-      expr = VariableSuffix();
-   {if (true) return expr;}
+      expr = VariableSuffix(prefix);
+                                 {if (true) return expr;}
       break;
     default:
-      jj_la1[61] = jj_gen;
+      jj_la1[64] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
     throw new Error("Missing return statement in function");
   }
 
-  static final public String VariableSuffix() throws ParseException {
+  static final public AbstractSuffixExpression VariableSuffix(Expression prefix) throws ParseException {
   String expr = null;
+  final int pos = SimpleCharStream.getPosition();
+  Expression expression = null;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case CLASSACCESS:
       jj_consume_token(CLASSACCESS);
@@ -2000,23 +2337,29 @@ final String type, expr;
     errorEnd   = jj_input_stream.getPosition() + 1;
     {if (true) throw e;}
       }
-   {if (true) return "->" + expr;}
+   {if (true) return new ClassAccess(prefix,
+                          new ConstantIdentifier(expr.toCharArray(),pos,SimpleCharStream.getPosition()),
+                          ClassAccess.NORMAL);}
       break;
     case LBRACKET:
       jj_consume_token(LBRACKET);
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case ARRAY:
-      case PRINT:
       case LIST:
+      case PRINT:
       case NEW:
       case NULL:
       case TRUE:
       case FALSE:
-      case INTEGER_LITERAL:
-      case FLOATING_POINT_LITERAL:
-      case STRING_LITERAL:
-      case IDENTIFIER:
-      case LPAREN:
+      case STRING:
+      case OBJECT:
+      case BOOL:
+      case BOOLEAN:
+      case REAL:
+      case DOUBLE:
+      case FLOAT:
+      case INT:
+      case INTEGER:
       case AT:
       case DOLLAR:
       case BANG:
@@ -2025,11 +2368,55 @@ final String type, expr;
       case PLUS:
       case MINUS:
       case BIT_AND:
+      case INTEGER_LITERAL:
+      case FLOATING_POINT_LITERAL:
+      case STRING_LITERAL:
+      case IDENTIFIER:
+      case LPAREN:
       case DOLLAR_ID:
-        expr = Expression();
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case ARRAY:
+        case LIST:
+        case PRINT:
+        case NEW:
+        case NULL:
+        case TRUE:
+        case FALSE:
+        case AT:
+        case DOLLAR:
+        case BANG:
+        case INCR:
+        case DECR:
+        case PLUS:
+        case MINUS:
+        case BIT_AND:
+        case INTEGER_LITERAL:
+        case FLOATING_POINT_LITERAL:
+        case STRING_LITERAL:
+        case IDENTIFIER:
+        case LPAREN:
+        case DOLLAR_ID:
+          expression = Expression();
+          break;
+        case STRING:
+        case OBJECT:
+        case BOOL:
+        case BOOLEAN:
+        case REAL:
+        case DOUBLE:
+        case FLOAT:
+        case INT:
+        case INTEGER:
+          expression = Type();
+          break;
+        default:
+          jj_la1[65] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
         break;
       default:
-        jj_la1[62] = jj_gen;
+        jj_la1[66] = jj_gen;
         ;
       }
       try {
@@ -2041,105 +2428,69 @@ final String type, expr;
     errorEnd   = jj_input_stream.getPosition() + 1;
     {if (true) throw e;}
       }
-    if(expr == null) {
-      {if (true) return "[]";}
-    }
-    {if (true) return "[" + expr + "]";}
+   {if (true) return new ArrayDeclarator(prefix,expression,SimpleCharStream.getPosition());}
       break;
     default:
-      jj_la1[63] = jj_gen;
+      jj_la1[67] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
     throw new Error("Missing return statement in function");
   }
 
-  static final public String Literal() throws ParseException {
-  final String expr;
+  static final public Literal Literal() throws ParseException {
   final Token token;
+  final int pos;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case INTEGER_LITERAL:
       token = jj_consume_token(INTEGER_LITERAL);
-   {if (true) return token.image;}
+                                    pos = SimpleCharStream.getPosition();
+                                    {if (true) return new NumberLiteral(token.image.toCharArray(),pos-token.image.length(),pos);}
       break;
     case FLOATING_POINT_LITERAL:
       token = jj_consume_token(FLOATING_POINT_LITERAL);
-   {if (true) return token.image;}
+                                    pos = SimpleCharStream.getPosition();
+                                    {if (true) return new NumberLiteral(token.image.toCharArray(),pos-token.image.length(),pos);}
       break;
     case STRING_LITERAL:
       token = jj_consume_token(STRING_LITERAL);
-   {if (true) return token.image;}
+                                    pos = SimpleCharStream.getPosition();
+                                    {if (true) return new StringLiteral(token.image.toCharArray(),pos-token.image.length(),pos);}
       break;
     case TRUE:
-    case FALSE:
-      expr = BooleanLiteral();
-   {if (true) return expr;}
-      break;
-    case NULL:
-      expr = NullLiteral();
-   {if (true) return expr;}
-      break;
-    default:
-      jj_la1[64] = jj_gen;
-      jj_consume_token(-1);
-      throw new ParseException();
-    }
-    throw new Error("Missing return statement in function");
-  }
-
-  static final public String BooleanLiteral() throws ParseException {
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case TRUE:
       jj_consume_token(TRUE);
-   {if (true) return "true";}
+                                    pos = SimpleCharStream.getPosition();
+                                    {if (true) return new TrueLiteral(pos-4,pos);}
       break;
     case FALSE:
       jj_consume_token(FALSE);
-   {if (true) return "false";}
+                                    pos = SimpleCharStream.getPosition();
+                                    {if (true) return new FalseLiteral(pos-4,pos);}
+      break;
+    case NULL:
+      jj_consume_token(NULL);
+                                    pos = SimpleCharStream.getPosition();
+                                    {if (true) return new NullLiteral(pos-4,pos);}
       break;
     default:
-      jj_la1[65] = jj_gen;
+      jj_la1[68] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
     throw new Error("Missing return statement in function");
   }
 
-  static final public String NullLiteral() throws ParseException {
-    jj_consume_token(NULL);
-   {if (true) return "null";}
-    throw new Error("Missing return statement in function");
-  }
-
-  static final public String Arguments() throws ParseException {
-String expr = null;
+  static final public FunctionCall Arguments(Expression func) throws ParseException {
+ArgumentDeclaration[] args = null;
     jj_consume_token(LPAREN);
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case ARRAY:
-    case PRINT:
-    case LIST:
-    case NEW:
-    case NULL:
-    case TRUE:
-    case FALSE:
-    case INTEGER_LITERAL:
-    case FLOATING_POINT_LITERAL:
-    case STRING_LITERAL:
-    case IDENTIFIER:
-    case LPAREN:
-    case AT:
     case DOLLAR:
-    case BANG:
-    case INCR:
-    case DECR:
-    case PLUS:
-    case MINUS:
     case BIT_AND:
     case DOLLAR_ID:
-      expr = ArgumentList();
+      args = ArgumentList();
       break;
     default:
-      jj_la1[66] = jj_gen;
+      jj_la1[69] = jj_gen;
       ;
     }
     try {
@@ -2151,125 +2502,175 @@ String expr = null;
     errorEnd   = jj_input_stream.getPosition() + 1;
     {if (true) throw e;}
     }
-  if (expr == null) {
-    {if (true) return "()";}
-  }
-  {if (true) return "(" + expr + ")";}
+   {if (true) return new FunctionCall(func,args,SimpleCharStream.getPosition());}
     throw new Error("Missing return statement in function");
   }
 
-  static final public String ArgumentList() throws ParseException {
-String expr;
-final StringBuffer buff = new StringBuffer();
-    expr = Expression();
-   buff.append(expr);
-    label_22:
+  static final public ArgumentDeclaration[] ArgumentList() throws ParseException {
+ArgumentDeclaration arg;
+final ArrayList list = new ArrayList();
+ArgumentDeclaration argument;
+    arg = argumentDeclaration();
+   list.add(arg);
+    label_21:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case COMMA:
         ;
         break;
       default:
-        jj_la1[67] = jj_gen;
-        break label_22;
+        jj_la1[70] = jj_gen;
+        break label_21;
       }
       jj_consume_token(COMMA);
       try {
-        expr = Expression();
+        arg = argumentDeclaration();
+         list.add(arg);
       } catch (ParseException e) {
-        errorMessage = "expression expected after a comma in argument list";
+        errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. An expression expected after a comma in argument list";
         errorLevel   = ERROR;
-        errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-        errorEnd   = jj_input_stream.getPosition() + 1;
+        errorStart   = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+        errorEnd     = jj_input_stream.getPosition() + 1;
         {if (true) throw e;}
       }
-      buff.append(",").append(expr);
     }
-    {if (true) return buff.toString();}
+   ArgumentDeclaration[] args = new ArgumentDeclaration[list.size()];
+   list.toArray(args);
+   {if (true) return args;}
+    throw new Error("Missing return statement in function");
+  }
+
+  static final public ArgumentDeclaration argumentDeclaration() throws ParseException {
+  boolean reference = false;
+  String varName;
+  Expression initializer = null;
+  final int pos = SimpleCharStream.getPosition();
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case BIT_AND:
+      jj_consume_token(BIT_AND);
+              reference = true;
+      break;
+    default:
+      jj_la1[71] = jj_gen;
+      ;
+    }
+    varName = VariableDeclaratorId();
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case ASSIGN:
+      jj_consume_token(ASSIGN);
+      try {
+        initializer = VariableInitializer();
+      } catch (ParseException e) {
+      errorMessage = "Literal expression expected in variable initializer";
+      errorLevel   = ERROR;
+      errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+      errorEnd   = jj_input_stream.getPosition() + 1;
+      {if (true) throw e;}
+      }
+      break;
+    default:
+      jj_la1[72] = jj_gen;
+      ;
+    }
+  if (initializer == null) {
+    {if (true) return new ArgumentDeclaration(varName.toCharArray(),
+                                   reference,
+                                   pos);}
+  }
+  {if (true) return new ArgumentDeclaration(varName.toCharArray(),
+                                 reference,
+                                 initializer,
+                                 pos);}
     throw new Error("Missing return statement in function");
   }
 
 /**
- * A Statement without break
+ * A Statement without break.
  */
-  static final public void StatementNoBreak() throws ParseException {
-    if (jj_2_5(2)) {
-      Expression();
+  static final public Statement StatementNoBreak() throws ParseException {
+  final Statement statement;
+  Token token = null;
+    if (jj_2_6(2)) {
+      statement = Expression();
       try {
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-        case SEMICOLON:
-          jj_consume_token(SEMICOLON);
-          break;
-        case PHPEND:
-          jj_consume_token(PHPEND);
-                             PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);
-          break;
-        default:
-          jj_la1[68] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
-        }
+        jj_consume_token(SEMICOLON);
       } catch (ParseException e) {
-    errorMessage = "';' expected";
-    errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    {if (true) throw e;}
+    if (e.currentToken.next.kind != 4) {
+      errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
+      errorLevel   = ERROR;
+      errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+      errorEnd   = jj_input_stream.getPosition() + 1;
+      {if (true) throw e;}
+    }
       }
-    } else if (jj_2_6(2)) {
-      LabeledStatement();
+   {if (true) return statement;}
+    } else if (jj_2_7(2)) {
+      statement = LabeledStatement();
+                                  {if (true) return statement;}
     } else {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case LBRACE:
-        Block();
+        statement = Block();
+                                  {if (true) return statement;}
         break;
       case SEMICOLON:
-        EmptyStatement();
+        statement = EmptyStatement();
+                                  {if (true) return statement;}
         break;
       case ARRAY:
       case NEW:
-      case IDENTIFIER:
       case DOLLAR:
       case INCR:
       case DECR:
+      case IDENTIFIER:
       case DOLLAR_ID:
-        StatementExpression();
+        statement = StatementExpression();
         try {
           jj_consume_token(SEMICOLON);
         } catch (ParseException e) {
-    errorMessage = "';' expected after expression";
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
+    errorStart   = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+    errorEnd     = jj_input_stream.getPosition() + 1;
     {if (true) throw e;}
         }
+   {if (true) return statement;}
         break;
       case SWITCH:
-        SwitchStatement();
+        statement = SwitchStatement();
+                                         {if (true) return statement;}
         break;
       case IF:
-        IfStatement();
+        statement = IfStatement();
+                                         {if (true) return statement;}
         break;
       case WHILE:
-        WhileStatement();
+        statement = WhileStatement();
+                                         {if (true) return statement;}
         break;
       case DO:
-        DoStatement();
+        statement = DoStatement();
+                                         {if (true) return statement;}
         break;
       case FOR:
-        ForStatement();
+        statement = ForStatement();
+                                         {if (true) return statement;}
         break;
       case FOREACH:
-        ForeachStatement();
+        statement = ForeachStatement();
+                                         {if (true) return statement;}
         break;
       case CONTINUE:
-        ContinueStatement();
+        statement = ContinueStatement();
+                                         {if (true) return statement;}
         break;
       case RETURN:
-        ReturnStatement();
+        statement = ReturnStatement();
+                                         {if (true) return statement;}
         break;
       case ECHO:
-        EchoStatement();
+        statement = EchoStatement();
+                                         {if (true) return statement;}
         break;
       case INCLUDE:
       case REQUIRE:
@@ -2278,35 +2679,44 @@ final StringBuffer buff = new StringBuffer();
       case AT:
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case AT:
-          jj_consume_token(AT);
+          token = jj_consume_token(AT);
           break;
         default:
-          jj_la1[69] = jj_gen;
+          jj_la1[73] = jj_gen;
           ;
         }
-        IncludeStatement();
+        statement = IncludeStatement();
+   if (token != null) {
+    ((InclusionStatement)statement).silent = true;
+  }
+  {if (true) return statement;}
         break;
       case STATIC:
-        StaticStatement();
+        statement = StaticStatement();
+                                         {if (true) return statement;}
         break;
       case GLOBAL:
-        GlobalStatement();
+        statement = GlobalStatement();
+                                         {if (true) return statement;}
         break;
       default:
-        jj_la1[70] = jj_gen;
+        jj_la1[74] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
     }
+    throw new Error("Missing return statement in function");
   }
 
 /**
- * A Normal statement
+ * A Normal statement.
  */
-  static final public void Statement() throws ParseException {
+  static final public Statement Statement() throws ParseException {
+  final Statement statement;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case IF:
     case ARRAY:
+    case LIST:
     case PRINT:
     case ECHO:
     case INCLUDE:
@@ -2315,7 +2725,6 @@ final StringBuffer buff = new StringBuffer();
     case REQUIRE_ONCE:
     case GLOBAL:
     case STATIC:
-    case LIST:
     case CONTINUE:
     case DO:
     case FOR:
@@ -2327,13 +2736,6 @@ final StringBuffer buff = new StringBuffer();
     case FALSE:
     case WHILE:
     case FOREACH:
-    case INTEGER_LITERAL:
-    case FLOATING_POINT_LITERAL:
-    case STRING_LITERAL:
-    case IDENTIFIER:
-    case LPAREN:
-    case LBRACE:
-    case SEMICOLON:
     case AT:
     case DOLLAR:
     case BANG:
@@ -2342,194 +2744,194 @@ final StringBuffer buff = new StringBuffer();
     case PLUS:
     case MINUS:
     case BIT_AND:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case STRING_LITERAL:
+    case IDENTIFIER:
+    case LPAREN:
+    case LBRACE:
+    case SEMICOLON:
     case DOLLAR_ID:
-      StatementNoBreak();
+      statement = StatementNoBreak();
+                                  {if (true) return statement;}
       break;
     case BREAK:
-      BreakStatement();
+      statement = BreakStatement();
+                                  {if (true) return statement;}
       break;
     default:
-      jj_la1[71] = jj_gen;
+      jj_la1[75] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void IncludeStatement() throws ParseException {
-  final String expr;
+/**
+ * An html block inside a php syntax.
+ */
+  static final public HTMLBlock htmlBlock() throws ParseException {
+  final int startIndex = nodePtr;
+  AstNode[] blockNodes;
+  int nbNodes;
+    jj_consume_token(PHPEND);
+    label_22:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case PHPECHOSTART:
+        ;
+        break;
+      default:
+        jj_la1[76] = jj_gen;
+        break label_22;
+      }
+      phpEchoBlock();
+    }
+    try {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case PHPSTARTLONG:
+        jj_consume_token(PHPSTARTLONG);
+        break;
+      case PHPSTARTSHORT:
+        jj_consume_token(PHPSTARTSHORT);
+        break;
+      default:
+        jj_la1[77] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    } catch (ParseException e) {
+    errorMessage = "End of file unexpected, '<?php' expected";
+    errorLevel   = ERROR;
+    errorStart   = jj_input_stream.getPosition();
+    errorEnd     = jj_input_stream.getPosition();
+    {if (true) throw e;}
+    }
+  nbNodes = nodePtr-startIndex;
+  blockNodes = new AstNode[nbNodes];
+  System.arraycopy(nodes,startIndex,blockNodes,0,nbNodes);
+  {if (true) return new HTMLBlock(nodes);}
+    throw new Error("Missing return statement in function");
+  }
+
+/**
+ * An include statement. It's "include" an expression;
+ */
+  static final public InclusionStatement IncludeStatement() throws ParseException {
+  final Expression expr;
+  final Token token;
+  final int keyword;
   final int pos = jj_input_stream.getPosition();
+  final InclusionStatement inclusionStatement;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case REQUIRE:
       jj_consume_token(REQUIRE);
-      expr = Expression();
-    if (currentSegment != null) {
-      currentSegment.add(new PHPReqIncDeclaration(currentSegment, "require",pos,expr));
-    }
-      try {
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-        case SEMICOLON:
-          jj_consume_token(SEMICOLON);
-          break;
-        case PHPEND:
-          jj_consume_token(PHPEND);
-                             PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);
-          break;
-        default:
-          jj_la1[72] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
-        }
-      } catch (ParseException e) {
-    errorMessage = "';' expected";
-    errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    {if (true) throw e;}
-      }
+                         keyword = InclusionStatement.REQUIRE;
       break;
     case REQUIRE_ONCE:
       jj_consume_token(REQUIRE_ONCE);
-      expr = Expression();
-    if (currentSegment != null) {
-      currentSegment.add(new PHPReqIncDeclaration(currentSegment, "require_once",pos,expr));
-    }
-      try {
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-        case SEMICOLON:
-          jj_consume_token(SEMICOLON);
-          break;
-        case PHPEND:
-          jj_consume_token(PHPEND);
-                             PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);
-          break;
-        default:
-          jj_la1[73] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
-        }
-      } catch (ParseException e) {
-    errorMessage = "';' expected";
-    errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    {if (true) throw e;}
-      }
+                         keyword = InclusionStatement.REQUIRE_ONCE;
       break;
     case INCLUDE:
       jj_consume_token(INCLUDE);
-      expr = Expression();
-    if (currentSegment != null) {
-      currentSegment.add(new PHPReqIncDeclaration(currentSegment, "include",pos,expr));
-    }
-      try {
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-        case SEMICOLON:
-          jj_consume_token(SEMICOLON);
-          break;
-        case PHPEND:
-          jj_consume_token(PHPEND);
-                             PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);
-          break;
-        default:
-          jj_la1[74] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
-        }
-      } catch (ParseException e) {
-    errorMessage = "';' expected";
-    errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    {if (true) throw e;}
-      }
+                         keyword = InclusionStatement.INCLUDE;
       break;
     case INCLUDE_ONCE:
       jj_consume_token(INCLUDE_ONCE);
-      expr = Expression();
-    if (currentSegment != null) {
-      currentSegment.add(new PHPReqIncDeclaration(currentSegment, "include_once",pos,expr));
-    }
-      try {
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-        case SEMICOLON:
-          jj_consume_token(SEMICOLON);
-          break;
-        case PHPEND:
-          jj_consume_token(PHPEND);
-                             PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);
-          break;
-        default:
-          jj_la1[75] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
-        }
-      } catch (ParseException e) {
-    errorMessage = "';' expected";
-    errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    {if (true) throw e;}
-      }
+                         keyword = InclusionStatement.INCLUDE_ONCE;
       break;
     default:
-      jj_la1[76] = jj_gen;
+      jj_la1[78] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
+    try {
+      expr = Expression();
+    } catch (ParseException e) {
+    if (errorMessage != null) {
+      {if (true) throw e;}
+    }
+    errorMessage = "unexpected token '"+ e.currentToken.next.image+"', expression expected";
+    errorLevel   = ERROR;
+    errorStart   = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+    errorEnd     = jj_input_stream.getPosition() + 1;
+    {if (true) throw e;}
+    }
+   inclusionStatement = new InclusionStatement(currentSegment,
+                                               keyword,
+                                               expr,
+                                               pos);
+   currentSegment.add(inclusionStatement);
+    try {
+      jj_consume_token(SEMICOLON);
+    } catch (ParseException e) {
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
+    errorLevel   = ERROR;
+    errorStart   = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+    errorEnd     = jj_input_stream.getPosition() + 1;
+    {if (true) throw e;}
+    }
+   {if (true) return inclusionStatement;}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public String PrintExpression() throws ParseException {
-  final StringBuffer buff = new StringBuffer("print ");
-  final String expr;
+  static final public PrintExpression PrintExpression() throws ParseException {
+  final Expression expr;
+  final int pos = SimpleCharStream.getPosition();
     jj_consume_token(PRINT);
     expr = Expression();
-    buff.append(expr);
-    {if (true) return buff.toString();}
+                               {if (true) return new PrintExpression(expr,pos,SimpleCharStream.getPosition());}
     throw new Error("Missing return statement in function");
   }
 
-  static final public String ListExpression() throws ParseException {
-  final StringBuffer buff = new StringBuffer("list(");
-  String expr;
+  static final public ListExpression ListExpression() throws ParseException {
+  String expr = null;
+  Expression expression = null;
+  ArrayList list = new ArrayList();
+  final int pos = SimpleCharStream.getPosition();
     jj_consume_token(LIST);
     try {
       jj_consume_token(LPAREN);
     } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
+    errorStart   = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+    errorEnd     = jj_input_stream.getPosition() + 1;
     {if (true) throw e;}
     }
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case DOLLAR:
     case DOLLAR_ID:
       expr = VariableDeclaratorId();
-     buff.append(expr);
+     list.add(expr);
       break;
     default:
-      jj_la1[77] = jj_gen;
+      jj_la1[79] = jj_gen;
       ;
     }
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case COMMA:
+   if (expr == null) list.add(null);
+    label_23:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case COMMA:
+        ;
+        break;
+      default:
+        jj_la1[80] = jj_gen;
+        break label_23;
+      }
       try {
         jj_consume_token(COMMA);
       } catch (ParseException e) {
       errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ',' expected";
       errorLevel   = ERROR;
-      errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-      errorEnd   = jj_input_stream.getPosition() + 1;
+      errorStart   = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+      errorEnd     = jj_input_stream.getPosition() + 1;
       {if (true) throw e;}
       }
       expr = VariableDeclaratorId();
-     buff.append(",").append(expr);
-      break;
-    default:
-      jj_la1[78] = jj_gen;
-      ;
+     list.add(expr);
     }
-   buff.append(")");
     try {
       jj_consume_token(RPAREN);
     } catch (ParseException e) {
@@ -2542,99 +2944,116 @@ final StringBuffer buff = new StringBuffer();
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case ASSIGN:
       jj_consume_token(ASSIGN);
-      expr = Expression();
-                                  buff.append("(").append(expr);
+      expression = Expression();
+    String[] strings = new String[list.size()];
+    list.toArray(strings);
+    {if (true) return new ListExpression(strings,
+                              expression,
+                              pos,
+                              SimpleCharStream.getPosition());}
       break;
     default:
-      jj_la1[79] = jj_gen;
+      jj_la1[81] = jj_gen;
       ;
     }
-   {if (true) return buff.toString();}
+    String[] strings = new String[list.size()];
+    list.toArray(strings);
+    {if (true) return new ListExpression(strings,pos,SimpleCharStream.getPosition());}
     throw new Error("Missing return statement in function");
   }
 
-  static final public void EchoStatement() throws ParseException {
+/**
+ * An echo statement.
+ * echo anyexpression (, otherexpression)*
+ */
+  static final public EchoStatement EchoStatement() throws ParseException {
+  final ArrayList expressions = new ArrayList();
+  Expression expr;
+  final int pos = SimpleCharStream.getPosition();
     jj_consume_token(ECHO);
-    Expression();
-    label_23:
+    expr = Expression();
+   expressions.add(expr);
+    label_24:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case COMMA:
         ;
         break;
       default:
-        jj_la1[80] = jj_gen;
-        break label_23;
+        jj_la1[82] = jj_gen;
+        break label_24;
       }
       jj_consume_token(COMMA);
-      Expression();
+      expr = Expression();
+     expressions.add(expr);
     }
     try {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case SEMICOLON:
-        jj_consume_token(SEMICOLON);
-        break;
-      case PHPEND:
-        jj_consume_token(PHPEND);
-                             PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);
-        break;
-      default:
-        jj_la1[81] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
-      }
+      jj_consume_token(SEMICOLON);
+    Expression[] exprs = new Expression[expressions.size()];
+    expressions.toArray(exprs);
+    {if (true) return new EchoStatement(exprs,pos);}
     } catch (ParseException e) {
-    errorMessage = "';' expected after 'echo' statement";
-    errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    {if (true) throw e;}
+    if (e.currentToken.next.kind != 4) {
+      errorMessage = "';' expected after 'echo' statement";
+      errorLevel   = ERROR;
+      errorStart   = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+      errorEnd     = jj_input_stream.getPosition() + 1;
+      {if (true) throw e;}
     }
+    }
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void GlobalStatement() throws ParseException {
+  static final public GlobalStatement GlobalStatement() throws ParseException {
+   final int pos = jj_input_stream.getPosition();
+   String expr;
+   ArrayList vars = new ArrayList();
+   GlobalStatement global;
     jj_consume_token(GLOBAL);
-    VariableDeclaratorId();
-    label_24:
+    expr = VariableDeclaratorId();
+     vars.add(expr);
+    label_25:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case COMMA:
         ;
         break;
       default:
-        jj_la1[82] = jj_gen;
-        break label_24;
+        jj_la1[83] = jj_gen;
+        break label_25;
       }
       jj_consume_token(COMMA);
-      VariableDeclaratorId();
+      expr = VariableDeclaratorId();
+     vars.add(expr);
     }
     try {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case SEMICOLON:
-        jj_consume_token(SEMICOLON);
-        break;
-      case PHPEND:
-        jj_consume_token(PHPEND);
-                             PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);
-        break;
-      default:
-        jj_la1[83] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
-      }
+      jj_consume_token(SEMICOLON);
+    String[] strings = new String[vars.size()];
+    vars.toArray(strings);
+    global = new GlobalStatement(currentSegment,
+                                 strings,
+                                 pos,
+                                 SimpleCharStream.getPosition());
+    currentSegment.add(global);
+    {if (true) return global;}
     } catch (ParseException e) {
-    errorMessage = "';' expected";
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. a ';' was expected";
     errorLevel   = ERROR;
     errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd   = jj_input_stream.getPosition() + 1;
     {if (true) throw e;}
     }
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void StaticStatement() throws ParseException {
+  static final public StaticStatement StaticStatement() throws ParseException {
+  final int pos = SimpleCharStream.getPosition();
+  final ArrayList vars = new ArrayList();
+  VariableDeclaration expr;
     jj_consume_token(STATIC);
-    VariableDeclarator();
-    label_25:
+    expr = VariableDeclarator();
+                                        vars.add(new String(expr.name));
+    label_26:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case COMMA:
@@ -2642,41 +3061,51 @@ final StringBuffer buff = new StringBuffer();
         break;
       default:
         jj_la1[84] = jj_gen;
-        break label_25;
+        break label_26;
       }
       jj_consume_token(COMMA);
-      VariableDeclarator();
+      expr = VariableDeclarator();
+                                        vars.add(new String(expr.name));
     }
     try {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case SEMICOLON:
-        jj_consume_token(SEMICOLON);
-        break;
-      case PHPEND:
-        jj_consume_token(PHPEND);
-                             PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);
-        break;
-      default:
-        jj_la1[85] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
-      }
+      jj_consume_token(SEMICOLON);
+    String[] strings = new String[vars.size()];
+    vars.toArray(strings);
+    {if (true) return new StaticStatement(strings,
+                                pos,
+                                SimpleCharStream.getPosition());}
     } catch (ParseException e) {
-    errorMessage = "';' expected";
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. a ';' was expected";
     errorLevel   = ERROR;
     errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd   = jj_input_stream.getPosition() + 1;
     {if (true) throw e;}
     }
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void LabeledStatement() throws ParseException {
-    jj_consume_token(IDENTIFIER);
+  static final public LabeledStatement LabeledStatement() throws ParseException {
+  final int pos = SimpleCharStream.getPosition();
+  final Token label;
+  final Statement statement;
+    label = jj_consume_token(IDENTIFIER);
     jj_consume_token(COLON);
-    Statement();
+    statement = Statement();
+   {if (true) return new LabeledStatement(label.image.toCharArray(),statement,pos,SimpleCharStream.getPosition());}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void Block() throws ParseException {
+/**
+ * A Block is
+ * {
+ * statements
+ * }.
+ * @return a block
+ */
+  static final public Block Block() throws ParseException {
+  final int pos = SimpleCharStream.getPosition();
+  final ArrayList list = new ArrayList();
+  Statement statement;
     try {
       jj_consume_token(LBRACE);
     } catch (ParseException e) {
@@ -2686,14 +3115,16 @@ final StringBuffer buff = new StringBuffer();
     errorEnd   = jj_input_stream.getPosition() + 1;
     {if (true) throw e;}
     }
-    label_26:
+    label_27:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case PHPEND:
       case CLASS:
       case FUNCTION:
       case IF:
       case ARRAY:
       case BREAK:
+      case LIST:
       case PRINT:
       case ECHO:
       case INCLUDE:
@@ -2702,7 +3133,6 @@ final StringBuffer buff = new StringBuffer();
       case REQUIRE_ONCE:
       case GLOBAL:
       case STATIC:
-      case LIST:
       case CONTINUE:
       case DO:
       case FOR:
@@ -2714,6 +3144,14 @@ final StringBuffer buff = new StringBuffer();
       case FALSE:
       case WHILE:
       case FOREACH:
+      case AT:
+      case DOLLAR:
+      case BANG:
+      case INCR:
+      case DECR:
+      case PLUS:
+      case MINUS:
+      case BIT_AND:
       case INTEGER_LITERAL:
       case FLOATING_POINT_LITERAL:
       case STRING_LITERAL:
@@ -2721,6 +3159,39 @@ final StringBuffer buff = new StringBuffer();
       case LPAREN:
       case LBRACE:
       case SEMICOLON:
+      case DOLLAR_ID:
+        ;
+        break;
+      default:
+        jj_la1[85] = jj_gen;
+        break label_27;
+      }
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case CLASS:
+      case FUNCTION:
+      case IF:
+      case ARRAY:
+      case BREAK:
+      case LIST:
+      case PRINT:
+      case ECHO:
+      case INCLUDE:
+      case REQUIRE:
+      case INCLUDE_ONCE:
+      case REQUIRE_ONCE:
+      case GLOBAL:
+      case STATIC:
+      case CONTINUE:
+      case DO:
+      case FOR:
+      case NEW:
+      case NULL:
+      case RETURN:
+      case SWITCH:
+      case TRUE:
+      case FALSE:
+      case WHILE:
+      case FOREACH:
       case AT:
       case DOLLAR:
       case BANG:
@@ -2729,14 +3200,26 @@ final StringBuffer buff = new StringBuffer();
       case PLUS:
       case MINUS:
       case BIT_AND:
+      case INTEGER_LITERAL:
+      case FLOATING_POINT_LITERAL:
+      case STRING_LITERAL:
+      case IDENTIFIER:
+      case LPAREN:
+      case LBRACE:
+      case SEMICOLON:
       case DOLLAR_ID:
-        ;
+        statement = BlockStatement();
+                                  list.add(statement);
+        break;
+      case PHPEND:
+        statement = htmlBlock();
+                                  list.add(statement);
         break;
       default:
         jj_la1[86] = jj_gen;
-        break label_26;
+        jj_consume_token(-1);
+        throw new ParseException();
       }
-      BlockStatement();
     }
     try {
       jj_consume_token(RBRACE);
@@ -2747,13 +3230,19 @@ final StringBuffer buff = new StringBuffer();
     errorEnd   = jj_input_stream.getPosition() + 1;
     {if (true) throw e;}
     }
+  Statement[] statements = new Statement[list.size()];
+  list.toArray(statements);
+  {if (true) return new Block(statements,pos,SimpleCharStream.getPosition());}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void BlockStatement() throws ParseException {
+  static final public Statement BlockStatement() throws ParseException {
+  final Statement statement;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case IF:
     case ARRAY:
     case BREAK:
+    case LIST:
     case PRINT:
     case ECHO:
     case INCLUDE:
@@ -2762,7 +3251,6 @@ final StringBuffer buff = new StringBuffer();
     case REQUIRE_ONCE:
     case GLOBAL:
     case STATIC:
-    case LIST:
     case CONTINUE:
     case DO:
     case FOR:
@@ -2774,13 +3262,6 @@ final StringBuffer buff = new StringBuffer();
     case FALSE:
     case WHILE:
     case FOREACH:
-    case INTEGER_LITERAL:
-    case FLOATING_POINT_LITERAL:
-    case STRING_LITERAL:
-    case IDENTIFIER:
-    case LPAREN:
-    case LBRACE:
-    case SEMICOLON:
     case AT:
     case DOLLAR:
     case BANG:
@@ -2789,29 +3270,42 @@ final StringBuffer buff = new StringBuffer();
     case PLUS:
     case MINUS:
     case BIT_AND:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case STRING_LITERAL:
+    case IDENTIFIER:
+    case LPAREN:
+    case LBRACE:
+    case SEMICOLON:
     case DOLLAR_ID:
-      Statement();
+      statement = Statement();
+                                   {if (true) return statement;}
       break;
     case CLASS:
-      ClassDeclaration();
+      statement = ClassDeclaration();
+                                   {if (true) return statement;}
       break;
     case FUNCTION:
-      MethodDeclaration();
+      statement = MethodDeclaration();
+                                   {if (true) return statement;}
       break;
     default:
       jj_la1[87] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
+    throw new Error("Missing return statement in function");
   }
 
 /**
  * A Block statement that will not contain any 'break'
  */
-  static final public void BlockStatementNoBreak() throws ParseException {
+  static final public Statement BlockStatementNoBreak() throws ParseException {
+  final Statement statement;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case IF:
     case ARRAY:
+    case LIST:
     case PRINT:
     case ECHO:
     case INCLUDE:
@@ -2820,7 +3314,6 @@ final StringBuffer buff = new StringBuffer();
     case REQUIRE_ONCE:
     case GLOBAL:
     case STATIC:
-    case LIST:
     case CONTINUE:
     case DO:
     case FOR:
@@ -2832,13 +3325,6 @@ final StringBuffer buff = new StringBuffer();
     case FALSE:
     case WHILE:
     case FOREACH:
-    case INTEGER_LITERAL:
-    case FLOATING_POINT_LITERAL:
-    case STRING_LITERAL:
-    case IDENTIFIER:
-    case LPAREN:
-    case LBRACE:
-    case SEMICOLON:
     case AT:
     case DOLLAR:
     case BANG:
@@ -2847,25 +3333,39 @@ final StringBuffer buff = new StringBuffer();
     case PLUS:
     case MINUS:
     case BIT_AND:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case STRING_LITERAL:
+    case IDENTIFIER:
+    case LPAREN:
+    case LBRACE:
+    case SEMICOLON:
     case DOLLAR_ID:
-      StatementNoBreak();
+      statement = StatementNoBreak();
+                                   {if (true) return statement;}
       break;
     case CLASS:
-      ClassDeclaration();
+      statement = ClassDeclaration();
+                                   {if (true) return statement;}
       break;
     case FUNCTION:
-      MethodDeclaration();
+      statement = MethodDeclaration();
+                                   {if (true) return statement;}
       break;
     default:
       jj_la1[88] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void LocalVariableDeclaration() throws ParseException {
-    LocalVariableDeclarator();
-    label_27:
+  static final public VariableDeclaration[] LocalVariableDeclaration() throws ParseException {
+  final ArrayList list = new ArrayList();
+  VariableDeclaration var;
+    var = LocalVariableDeclarator();
+   list.add(var);
+    label_28:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case COMMA:
@@ -2873,45 +3373,71 @@ final StringBuffer buff = new StringBuffer();
         break;
       default:
         jj_la1[89] = jj_gen;
-        break label_27;
+        break label_28;
       }
       jj_consume_token(COMMA);
-      LocalVariableDeclarator();
+      var = LocalVariableDeclarator();
+                                             list.add(var);
     }
+    VariableDeclaration[] vars = new VariableDeclaration[list.size()];
+    list.toArray(vars);
+  {if (true) return vars;}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void LocalVariableDeclarator() throws ParseException {
-    VariableDeclaratorId();
+  static final public VariableDeclaration LocalVariableDeclarator() throws ParseException {
+  final String varName;
+  Expression initializer = null;
+  final int pos = SimpleCharStream.getPosition();
+    varName = VariableDeclaratorId();
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case ASSIGN:
       jj_consume_token(ASSIGN);
-      Expression();
+      initializer = Expression();
       break;
     default:
       jj_la1[90] = jj_gen;
       ;
     }
+   if (initializer == null) {
+    {if (true) return new VariableDeclaration(currentSegment,
+                                  varName.toCharArray(),
+                                  pos,
+                                  jj_input_stream.getPosition());}
+   }
+    {if (true) return new VariableDeclaration(currentSegment,
+                                    varName.toCharArray(),
+                                    initializer,
+                                    pos);}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void EmptyStatement() throws ParseException {
+  static final public EmptyStatement EmptyStatement() throws ParseException {
+  final int pos;
     jj_consume_token(SEMICOLON);
+   pos = SimpleCharStream.getPosition();
+   {if (true) return new EmptyStatement(pos-1,pos);}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void StatementExpression() throws ParseException {
+  static final public Statement StatementExpression() throws ParseException {
+  Expression expr,expr2;
+  int operator;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case INCR:
-      PreIncrementExpression();
-      break;
     case DECR:
-      PreDecrementExpression();
+      expr = PreIncDecExpression();
+                                {if (true) return expr;}
       break;
     case ARRAY:
     case NEW:
-    case IDENTIFIER:
     case DOLLAR:
+    case IDENTIFIER:
     case DOLLAR_ID:
-      PrimaryExpression();
+      expr = PrimaryExpression();
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case INCR:
+      case DECR:
       case ASSIGN:
       case PLUSASSIGN:
       case MINUSASSIGN:
@@ -2923,16 +3449,20 @@ final StringBuffer buff = new StringBuffer();
       case DOTASSIGN:
       case REMASSIGN:
       case TILDEEQUAL:
-      case INCR:
-      case DECR:
       case LSHIFTASSIGN:
       case RSIGNEDSHIFTASSIGN:
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case INCR:
           jj_consume_token(INCR);
+            {if (true) return new PostfixedUnaryExpression(expr,
+                                                OperatorIds.PLUS_PLUS,
+                                                SimpleCharStream.getPosition());}
           break;
         case DECR:
           jj_consume_token(DECR);
+            {if (true) return new PostfixedUnaryExpression(expr,
+                                                OperatorIds.MINUS_MINUS,
+                                                SimpleCharStream.getPosition());}
           break;
         case ASSIGN:
         case PLUSASSIGN:
@@ -2947,8 +3477,9 @@ final StringBuffer buff = new StringBuffer();
         case TILDEEQUAL:
         case LSHIFTASSIGN:
         case RSIGNEDSHIFTASSIGN:
-          AssignmentOperator();
-          Expression();
+          operator = AssignmentOperator();
+          expr2 = Expression();
+     {if (true) return new BinaryExpression(expr,expr2,operator);}
           break;
         default:
           jj_la1[91] = jj_gen;
@@ -2960,17 +3491,20 @@ final StringBuffer buff = new StringBuffer();
         jj_la1[92] = jj_gen;
         ;
       }
+   {if (true) return expr;}
       break;
     default:
       jj_la1[93] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void SwitchStatement() throws ParseException {
-  Token breakToken = null;
-  int line;
+  static final public SwitchStatement SwitchStatement() throws ParseException {
+  final Expression variable;
+  final AbstractCase[] cases;
+  final int pos = SimpleCharStream.getPosition();
     jj_consume_token(SWITCH);
     try {
       jj_consume_token(LPAREN);
@@ -2981,26 +3515,48 @@ final StringBuffer buff = new StringBuffer();
     errorEnd   = jj_input_stream.getPosition() + 1;
     {if (true) throw e;}
     }
-    Expression();
     try {
-      jj_consume_token(RPAREN);
+      variable = Expression();
     } catch (ParseException e) {
-    errorMessage = "')' expected";
+    if (errorMessage != null) {
+      {if (true) throw e;}
+    }
+    errorMessage = "expression expected";
     errorLevel   = ERROR;
     errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd   = jj_input_stream.getPosition() + 1;
     {if (true) throw e;}
     }
     try {
-      jj_consume_token(LBRACE);
+      jj_consume_token(RPAREN);
     } catch (ParseException e) {
-    errorMessage = "'{' expected";
+    errorMessage = "')' expected";
     errorLevel   = ERROR;
     errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd   = jj_input_stream.getPosition() + 1;
     {if (true) throw e;}
     }
-    label_28:
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case LBRACE:
+      cases = switchStatementBrace();
+      break;
+    case COLON:
+      cases = switchStatementColon(pos, pos + 6);
+      break;
+    default:
+      jj_la1[94] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+   {if (true) return new SwitchStatement(variable,cases,pos,SimpleCharStream.getPosition());}
+    throw new Error("Missing return statement in function");
+  }
+
+  static final public AbstractCase[] switchStatementBrace() throws ParseException {
+  AbstractCase cas;
+  final ArrayList cases = new ArrayList();
+    jj_consume_token(LBRACE);
+    label_29:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case CASE:
@@ -3008,83 +3564,17 @@ final StringBuffer buff = new StringBuffer();
         ;
         break;
       default:
-        jj_la1[94] = jj_gen;
-        break label_28;
-      }
-      line = SwitchLabel();
-      label_29:
-      while (true) {
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-        case CLASS:
-        case FUNCTION:
-        case IF:
-        case ARRAY:
-        case PRINT:
-        case ECHO:
-        case INCLUDE:
-        case REQUIRE:
-        case INCLUDE_ONCE:
-        case REQUIRE_ONCE:
-        case GLOBAL:
-        case STATIC:
-        case LIST:
-        case CONTINUE:
-        case DO:
-        case FOR:
-        case NEW:
-        case NULL:
-        case RETURN:
-        case SWITCH:
-        case TRUE:
-        case FALSE:
-        case WHILE:
-        case FOREACH:
-        case INTEGER_LITERAL:
-        case FLOATING_POINT_LITERAL:
-        case STRING_LITERAL:
-        case IDENTIFIER:
-        case LPAREN:
-        case LBRACE:
-        case SEMICOLON:
-        case AT:
-        case DOLLAR:
-        case BANG:
-        case INCR:
-        case DECR:
-        case PLUS:
-        case MINUS:
-        case BIT_AND:
-        case DOLLAR_ID:
-          ;
-          break;
-        default:
-          jj_la1[95] = jj_gen;
-          break label_29;
-        }
-        BlockStatementNoBreak();
-      }
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case BREAK:
-        breakToken = BreakStatement();
-        break;
-      default:
-        jj_la1[96] = jj_gen;
-        ;
+        jj_la1[95] = jj_gen;
+        break label_29;
       }
-        try {
-          if (breakToken == null) {
-            setMarker(fileToParse,
-                      "You should use put a 'break' at the end of your statement",
-                      line,
-                      INFO,
-                      "Line " + line);
-          }
-        } catch (CoreException e) {
-          PHPeclipsePlugin.log(e);
-        }
+      cas = switchLabel0();
+                         cases.add(cas);
     }
     try {
       jj_consume_token(RBRACE);
+    AbstractCase[] abcase = new AbstractCase[cases.size()];
+    cases.toArray(abcase);
+    {if (true) return abcase;}
     } catch (ParseException e) {
     errorMessage = "'}' expected";
     errorLevel   = ERROR;
@@ -3092,59 +3582,208 @@ final StringBuffer buff = new StringBuffer();
     errorEnd   = jj_input_stream.getPosition() + 1;
     {if (true) throw e;}
     }
+    throw new Error("Missing return statement in function");
   }
 
-  static final public Token BreakStatement() throws ParseException {
-  final Token token;
-    token = jj_consume_token(BREAK);
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case ARRAY:
-    case PRINT:
-    case LIST:
-    case NEW:
-    case NULL:
-    case TRUE:
-    case FALSE:
-    case INTEGER_LITERAL:
-    case FLOATING_POINT_LITERAL:
-    case STRING_LITERAL:
-    case IDENTIFIER:
-    case LPAREN:
-    case AT:
-    case DOLLAR:
-    case BANG:
-    case INCR:
-    case DECR:
-    case PLUS:
-    case MINUS:
-    case BIT_AND:
-    case DOLLAR_ID:
-      Expression();
-      break;
-    default:
-      jj_la1[97] = jj_gen;
-      ;
+/**
+ * A Switch statement with : ... endswitch;
+ * @param start the begin offset of the switch
+ * @param end the end offset of the switch
+ */
+  static final public AbstractCase[] switchStatementColon(final int start, final int end) throws ParseException {
+  AbstractCase cas;
+  final ArrayList cases = new ArrayList();
+    jj_consume_token(COLON);
+   try {
+  setMarker(fileToParse,
+            "Ugly syntax detected, you should switch () {...} instead of switch (): ... enswitch;",
+            start,
+            end,
+            INFO,
+            "Line " + token.beginLine);
+  } catch (CoreException e) {
+    PHPeclipsePlugin.log(e);
+  }
+    label_30:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case CASE:
+      case _DEFAULT:
+        ;
+        break;
+      default:
+        jj_la1[96] = jj_gen;
+        break label_30;
+      }
+      cas = switchLabel0();
+                          cases.add(cas);
+    }
+    try {
+      jj_consume_token(ENDSWITCH);
+    } catch (ParseException e) {
+    errorMessage = "'endswitch' expected";
+    errorLevel   = ERROR;
+    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+    errorEnd   = jj_input_stream.getPosition() + 1;
+    {if (true) throw e;}
     }
     try {
       jj_consume_token(SEMICOLON);
+    AbstractCase[] abcase = new AbstractCase[cases.size()];
+    cases.toArray(abcase);
+    {if (true) return abcase;}
     } catch (ParseException e) {
-    errorMessage = "';' expected after 'break' keyword";
+    errorMessage = "';' expected after 'endswitch' keyword";
     errorLevel   = ERROR;
     errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd   = jj_input_stream.getPosition() + 1;
     {if (true) throw e;}
     }
-   {if (true) return token;}
     throw new Error("Missing return statement in function");
   }
 
-  static final public int SwitchLabel() throws ParseException {
+  static final public AbstractCase switchLabel0() throws ParseException {
+  final Expression expr;
+  Statement statement;
+  final ArrayList stmts = new ArrayList();
+  final int pos = SimpleCharStream.getPosition();
+    expr = SwitchLabel();
+    label_31:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case PHPEND:
+      case CLASS:
+      case FUNCTION:
+      case IF:
+      case ARRAY:
+      case LIST:
+      case PRINT:
+      case ECHO:
+      case INCLUDE:
+      case REQUIRE:
+      case INCLUDE_ONCE:
+      case REQUIRE_ONCE:
+      case GLOBAL:
+      case STATIC:
+      case CONTINUE:
+      case DO:
+      case FOR:
+      case NEW:
+      case NULL:
+      case RETURN:
+      case SWITCH:
+      case TRUE:
+      case FALSE:
+      case WHILE:
+      case FOREACH:
+      case AT:
+      case DOLLAR:
+      case BANG:
+      case INCR:
+      case DECR:
+      case PLUS:
+      case MINUS:
+      case BIT_AND:
+      case INTEGER_LITERAL:
+      case FLOATING_POINT_LITERAL:
+      case STRING_LITERAL:
+      case IDENTIFIER:
+      case LPAREN:
+      case LBRACE:
+      case SEMICOLON:
+      case DOLLAR_ID:
+        ;
+        break;
+      default:
+        jj_la1[97] = jj_gen;
+        break label_31;
+      }
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case CLASS:
+      case FUNCTION:
+      case IF:
+      case ARRAY:
+      case LIST:
+      case PRINT:
+      case ECHO:
+      case INCLUDE:
+      case REQUIRE:
+      case INCLUDE_ONCE:
+      case REQUIRE_ONCE:
+      case GLOBAL:
+      case STATIC:
+      case CONTINUE:
+      case DO:
+      case FOR:
+      case NEW:
+      case NULL:
+      case RETURN:
+      case SWITCH:
+      case TRUE:
+      case FALSE:
+      case WHILE:
+      case FOREACH:
+      case AT:
+      case DOLLAR:
+      case BANG:
+      case INCR:
+      case DECR:
+      case PLUS:
+      case MINUS:
+      case BIT_AND:
+      case INTEGER_LITERAL:
+      case FLOATING_POINT_LITERAL:
+      case STRING_LITERAL:
+      case IDENTIFIER:
+      case LPAREN:
+      case LBRACE:
+      case SEMICOLON:
+      case DOLLAR_ID:
+        statement = BlockStatementNoBreak();
+                                         stmts.add(statement);
+        break;
+      case PHPEND:
+        statement = htmlBlock();
+                                         stmts.add(statement);
+        break;
+      default:
+        jj_la1[98] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    }
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case BREAK:
+      statement = BreakStatement();
+                                         stmts.add(statement);
+      break;
+    default:
+      jj_la1[99] = jj_gen;
+      ;
+    }
+  Statement[] stmtsArray = new Statement[stmts.size()];
+  stmts.toArray(stmtsArray);
+  if (expr == null) {//it's a default
+    {if (true) return new DefaultCase(stmtsArray,pos,SimpleCharStream.getPosition());}
+  }
+  {if (true) return new Case(expr,stmtsArray,pos,SimpleCharStream.getPosition());}
+    throw new Error("Missing return statement in function");
+  }
+
+/**
+ * A SwitchLabel.
+ * case Expression() :
+ * default :
+ * @return the if it was a case and null if not
+ */
+  static final public Expression SwitchLabel() throws ParseException {
   final Token token;
+  final Expression expr;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case CASE:
       token = jj_consume_token(CASE);
       try {
-        Expression();
+        expr = Expression();
       } catch (ParseException e) {
     if (errorMessage != null) {if (true) throw e;}
     errorMessage = "expression expected after 'case' keyword";
@@ -3155,6 +3794,7 @@ final StringBuffer buff = new StringBuffer();
       }
       try {
         jj_consume_token(COLON);
+     {if (true) return expr;}
       } catch (ParseException e) {
     errorMessage = "':' expected after case expression";
     errorLevel   = ERROR;
@@ -3162,12 +3802,12 @@ final StringBuffer buff = new StringBuffer();
     errorEnd   = jj_input_stream.getPosition() + 1;
     {if (true) throw e;}
       }
-   {if (true) return token.beginLine;}
       break;
     case _DEFAULT:
       token = jj_consume_token(_DEFAULT);
       try {
         jj_consume_token(COLON);
+     {if (true) return null;}
       } catch (ParseException e) {
     errorMessage = "':' expected after 'default' keyword";
     errorLevel   = ERROR;
@@ -3175,25 +3815,73 @@ final StringBuffer buff = new StringBuffer();
     errorEnd   = jj_input_stream.getPosition() + 1;
     {if (true) throw e;}
       }
-   {if (true) return token.beginLine;}
       break;
     default:
-      jj_la1[98] = jj_gen;
+      jj_la1[100] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
     throw new Error("Missing return statement in function");
   }
 
-  static final public void IfStatement() throws ParseException {
-  final Token token;
+  static final public Break BreakStatement() throws ParseException {
+  Expression expression = null;
+  final int start = SimpleCharStream.getPosition();
+    jj_consume_token(BREAK);
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case ARRAY:
+    case LIST:
+    case PRINT:
+    case NEW:
+    case NULL:
+    case TRUE:
+    case FALSE:
+    case AT:
+    case DOLLAR:
+    case BANG:
+    case INCR:
+    case DECR:
+    case PLUS:
+    case MINUS:
+    case BIT_AND:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case STRING_LITERAL:
+    case IDENTIFIER:
+    case LPAREN:
+    case DOLLAR_ID:
+      expression = Expression();
+      break;
+    default:
+      jj_la1[101] = jj_gen;
+      ;
+    }
+    try {
+      jj_consume_token(SEMICOLON);
+    } catch (ParseException e) {
+    errorMessage = "';' expected after 'break' keyword";
+    errorLevel   = ERROR;
+    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+    errorEnd   = jj_input_stream.getPosition() + 1;
+    {if (true) throw e;}
+    }
+   {if (true) return new Break(expression, start, SimpleCharStream.getPosition());}
+    throw new Error("Missing return statement in function");
+  }
+
+  static final public IfStatement IfStatement() throws ParseException {
   final int pos = jj_input_stream.getPosition();
-    token = jj_consume_token(IF);
-    Condition("if");
-    IfStatement0(pos,pos+token.image.length());
+  Expression condition;
+  IfStatement ifStatement;
+    jj_consume_token(IF);
+    condition = Condition("if");
+    ifStatement = IfStatement0(condition, pos,pos+2);
+   {if (true) return ifStatement;}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void Condition(final String keyword) throws ParseException {
+  static final public Expression Condition(final String keyword) throws ParseException {
+  final Expression condition;
     try {
       jj_consume_token(LPAREN);
     } catch (ParseException e) {
@@ -3203,9 +3891,10 @@ final StringBuffer buff = new StringBuffer();
     errorEnd   = errorStart +1;
     processParseException(e);
     }
-    Expression();
+    condition = Expression();
     try {
       jj_consume_token(RPAREN);
+      {if (true) return condition;}
     } catch (ParseException e) {
     errorMessage = "')' expected after " + keyword + " keyword";
     errorLevel   = ERROR;
@@ -3213,18 +3902,32 @@ final StringBuffer buff = new StringBuffer();
     errorEnd   = jj_input_stream.getPosition() + 1;
     {if (true) throw e;}
     }
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void IfStatement0(final int start,final int end) throws ParseException {
+  static final public IfStatement IfStatement0(Expression condition, final int start,final int end) throws ParseException {
+  Statement statement;
+  Statement stmt;
+  final Statement[] statementsArray;
+  ElseIf elseifStatement;
+  Else elseStatement = null;
+  ArrayList stmts;
+  final ArrayList elseIfList = new ArrayList();
+  ElseIf[] elseIfs;
+  int pos = SimpleCharStream.getPosition();
+  int endStatements;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case COLON:
       jj_consume_token(COLON);
-      label_30:
+   stmts = new ArrayList();
+      label_32:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case PHPEND:
         case IF:
         case ARRAY:
         case BREAK:
+        case LIST:
         case PRINT:
         case ECHO:
         case INCLUDE:
@@ -3233,7 +3936,6 @@ final StringBuffer buff = new StringBuffer();
         case REQUIRE_ONCE:
         case GLOBAL:
         case STATIC:
-        case LIST:
         case CONTINUE:
         case DO:
         case FOR:
@@ -3245,6 +3947,14 @@ final StringBuffer buff = new StringBuffer();
         case FALSE:
         case WHILE:
         case FOREACH:
+        case AT:
+        case DOLLAR:
+        case BANG:
+        case INCR:
+        case DECR:
+        case PLUS:
+        case MINUS:
+        case BIT_AND:
         case INTEGER_LITERAL:
         case FLOATING_POINT_LITERAL:
         case STRING_LITERAL:
@@ -3252,6 +3962,37 @@ final StringBuffer buff = new StringBuffer();
         case LPAREN:
         case LBRACE:
         case SEMICOLON:
+        case DOLLAR_ID:
+          ;
+          break;
+        default:
+          jj_la1[102] = jj_gen;
+          break label_32;
+        }
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case IF:
+        case ARRAY:
+        case BREAK:
+        case LIST:
+        case PRINT:
+        case ECHO:
+        case INCLUDE:
+        case REQUIRE:
+        case INCLUDE_ONCE:
+        case REQUIRE_ONCE:
+        case GLOBAL:
+        case STATIC:
+        case CONTINUE:
+        case DO:
+        case FOR:
+        case NEW:
+        case NULL:
+        case RETURN:
+        case SWITCH:
+        case TRUE:
+        case FALSE:
+        case WHILE:
+        case FOREACH:
         case AT:
         case DOLLAR:
         case BANG:
@@ -3260,33 +4001,47 @@ final StringBuffer buff = new StringBuffer();
         case PLUS:
         case MINUS:
         case BIT_AND:
+        case INTEGER_LITERAL:
+        case FLOATING_POINT_LITERAL:
+        case STRING_LITERAL:
+        case IDENTIFIER:
+        case LPAREN:
+        case LBRACE:
+        case SEMICOLON:
         case DOLLAR_ID:
-          ;
+          statement = Statement();
+                              stmts.add(statement);
+          break;
+        case PHPEND:
+          statement = htmlBlock();
+                              stmts.add(statement);
           break;
         default:
-          jj_la1[99] = jj_gen;
-          break label_30;
+          jj_la1[103] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
         }
-        Statement();
       }
-      label_31:
+    endStatements = SimpleCharStream.getPosition();
+      label_33:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case ELSEIF:
           ;
           break;
         default:
-          jj_la1[100] = jj_gen;
-          break label_31;
+          jj_la1[104] = jj_gen;
+          break label_33;
         }
-        ElseIfStatementColon();
+        elseifStatement = ElseIfStatementColon();
+                                              elseIfList.add(elseifStatement);
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case ELSE:
-        ElseStatementColon();
+        elseStatement = ElseStatementColon();
         break;
       default:
-        jj_la1[101] = jj_gen;
+        jj_la1[105] = jj_gen;
         ;
       }
    try {
@@ -3317,10 +4072,31 @@ final StringBuffer buff = new StringBuffer();
     errorEnd   = jj_input_stream.getPosition() + 1;
     {if (true) throw e;}
       }
+    elseIfs = new ElseIf[elseIfList.size()];
+    elseIfList.toArray(elseIfs);
+    if (stmts.size() == 1) {
+      {if (true) return new IfStatement(condition,
+                             (Statement) stmts.get(0),
+                              elseIfs,
+                              elseStatement,
+                              pos,
+                              SimpleCharStream.getPosition());}
+    } else {
+      statementsArray = new Statement[stmts.size()];
+      stmts.toArray(statementsArray);
+      {if (true) return new IfStatement(condition,
+                             new Block(statementsArray,pos,endStatements),
+                              elseIfs,
+                              elseStatement,
+                              pos,
+                              SimpleCharStream.getPosition());}
+    }
       break;
+    case PHPEND:
     case IF:
     case ARRAY:
     case BREAK:
+    case LIST:
     case PRINT:
     case ECHO:
     case INCLUDE:
@@ -3329,7 +4105,6 @@ final StringBuffer buff = new StringBuffer();
     case REQUIRE_ONCE:
     case GLOBAL:
     case STATIC:
-    case LIST:
     case CONTINUE:
     case DO:
     case FOR:
@@ -3341,13 +4116,6 @@ final StringBuffer buff = new StringBuffer();
     case FALSE:
     case WHILE:
     case FOREACH:
-    case INTEGER_LITERAL:
-    case FLOATING_POINT_LITERAL:
-    case STRING_LITERAL:
-    case IDENTIFIER:
-    case LPAREN:
-    case LBRACE:
-    case SEMICOLON:
     case AT:
     case DOLLAR:
     case BANG:
@@ -3356,47 +4124,132 @@ final StringBuffer buff = new StringBuffer();
     case PLUS:
     case MINUS:
     case BIT_AND:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case STRING_LITERAL:
+    case IDENTIFIER:
+    case LPAREN:
+    case LBRACE:
+    case SEMICOLON:
     case DOLLAR_ID:
-      Statement();
-      label_32:
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case IF:
+      case ARRAY:
+      case BREAK:
+      case LIST:
+      case PRINT:
+      case ECHO:
+      case INCLUDE:
+      case REQUIRE:
+      case INCLUDE_ONCE:
+      case REQUIRE_ONCE:
+      case GLOBAL:
+      case STATIC:
+      case CONTINUE:
+      case DO:
+      case FOR:
+      case NEW:
+      case NULL:
+      case RETURN:
+      case SWITCH:
+      case TRUE:
+      case FALSE:
+      case WHILE:
+      case FOREACH:
+      case AT:
+      case DOLLAR:
+      case BANG:
+      case INCR:
+      case DECR:
+      case PLUS:
+      case MINUS:
+      case BIT_AND:
+      case INTEGER_LITERAL:
+      case FLOATING_POINT_LITERAL:
+      case STRING_LITERAL:
+      case IDENTIFIER:
+      case LPAREN:
+      case LBRACE:
+      case SEMICOLON:
+      case DOLLAR_ID:
+        stmt = Statement();
+        break;
+      case PHPEND:
+        stmt = htmlBlock();
+        break;
+      default:
+        jj_la1[106] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+      label_34:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case ELSEIF:
           ;
           break;
         default:
-          jj_la1[102] = jj_gen;
-          break label_32;
+          jj_la1[107] = jj_gen;
+          break label_34;
         }
-        ElseIfStatement();
+        elseifStatement = ElseIfStatement();
+                                                      elseIfList.add(elseifStatement);
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case ELSE:
         jj_consume_token(ELSE);
-        Statement();
+        try {
+       pos = SimpleCharStream.getPosition();
+          statement = Statement();
+       elseStatement = new Else(statement,pos,SimpleCharStream.getPosition());
+        } catch (ParseException e) {
+      if (errorMessage != null) {
+        {if (true) throw e;}
+      }
+      errorMessage = "unexpected token '"+e.currentToken.next.image+"', a statement was expected";
+      errorLevel   = ERROR;
+      errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+      errorEnd   = jj_input_stream.getPosition() + 1;
+      {if (true) throw e;}
+        }
         break;
       default:
-        jj_la1[103] = jj_gen;
+        jj_la1[108] = jj_gen;
         ;
       }
+    elseIfs = new ElseIf[elseIfList.size()];
+    elseIfList.toArray(elseIfs);
+    {if (true) return new IfStatement(condition,
+                           stmt,
+                           elseIfs,
+                           elseStatement,
+                           pos,
+                           SimpleCharStream.getPosition());}
       break;
     default:
-      jj_la1[104] = jj_gen;
+      jj_la1[109] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void ElseIfStatementColon() throws ParseException {
+  static final public ElseIf ElseIfStatementColon() throws ParseException {
+  Expression condition;
+  Statement statement;
+  final ArrayList list = new ArrayList();
+  final int pos = SimpleCharStream.getPosition();
     jj_consume_token(ELSEIF);
-    Condition("elseif");
+    condition = Condition("elseif");
     jj_consume_token(COLON);
-    label_33:
+    label_35:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case PHPEND:
       case IF:
       case ARRAY:
       case BREAK:
+      case LIST:
       case PRINT:
       case ECHO:
       case INCLUDE:
@@ -3405,7 +4258,6 @@ final StringBuffer buff = new StringBuffer();
       case REQUIRE_ONCE:
       case GLOBAL:
       case STATIC:
-      case LIST:
       case CONTINUE:
       case DO:
       case FOR:
@@ -3417,6 +4269,14 @@ final StringBuffer buff = new StringBuffer();
       case FALSE:
       case WHILE:
       case FOREACH:
+      case AT:
+      case DOLLAR:
+      case BANG:
+      case INCR:
+      case DECR:
+      case PLUS:
+      case MINUS:
+      case BIT_AND:
       case INTEGER_LITERAL:
       case FLOATING_POINT_LITERAL:
       case STRING_LITERAL:
@@ -3424,6 +4284,37 @@ final StringBuffer buff = new StringBuffer();
       case LPAREN:
       case LBRACE:
       case SEMICOLON:
+      case DOLLAR_ID:
+        ;
+        break;
+      default:
+        jj_la1[110] = jj_gen;
+        break label_35;
+      }
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case IF:
+      case ARRAY:
+      case BREAK:
+      case LIST:
+      case PRINT:
+      case ECHO:
+      case INCLUDE:
+      case REQUIRE:
+      case INCLUDE_ONCE:
+      case REQUIRE_ONCE:
+      case GLOBAL:
+      case STATIC:
+      case CONTINUE:
+      case DO:
+      case FOR:
+      case NEW:
+      case NULL:
+      case RETURN:
+      case SWITCH:
+      case TRUE:
+      case FALSE:
+      case WHILE:
+      case FOREACH:
       case AT:
       case DOLLAR:
       case BANG:
@@ -3432,26 +4323,47 @@ final StringBuffer buff = new StringBuffer();
       case PLUS:
       case MINUS:
       case BIT_AND:
+      case INTEGER_LITERAL:
+      case FLOATING_POINT_LITERAL:
+      case STRING_LITERAL:
+      case IDENTIFIER:
+      case LPAREN:
+      case LBRACE:
+      case SEMICOLON:
       case DOLLAR_ID:
-        ;
+        statement = Statement();
+                                      list.add(statement);
+        break;
+      case PHPEND:
+        statement = htmlBlock();
+                                      list.add(statement);
         break;
       default:
-        jj_la1[105] = jj_gen;
-        break label_33;
+        jj_la1[111] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
       }
-      Statement();
     }
+  Statement[] stmtsArray = new Statement[list.size()];
+  list.toArray(stmtsArray);
+  {if (true) return new ElseIf(condition,stmtsArray ,pos,SimpleCharStream.getPosition());}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void ElseStatementColon() throws ParseException {
+  static final public Else ElseStatementColon() throws ParseException {
+  Statement statement;
+  final ArrayList list = new ArrayList();
+  final int pos = SimpleCharStream.getPosition();
     jj_consume_token(ELSE);
     jj_consume_token(COLON);
-    label_34:
+    label_36:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case PHPEND:
       case IF:
       case ARRAY:
       case BREAK:
+      case LIST:
       case PRINT:
       case ECHO:
       case INCLUDE:
@@ -3460,7 +4372,6 @@ final StringBuffer buff = new StringBuffer();
       case REQUIRE_ONCE:
       case GLOBAL:
       case STATIC:
-      case LIST:
       case CONTINUE:
       case DO:
       case FOR:
@@ -3472,6 +4383,14 @@ final StringBuffer buff = new StringBuffer();
       case FALSE:
       case WHILE:
       case FOREACH:
+      case AT:
+      case DOLLAR:
+      case BANG:
+      case INCR:
+      case DECR:
+      case PLUS:
+      case MINUS:
+      case BIT_AND:
       case INTEGER_LITERAL:
       case FLOATING_POINT_LITERAL:
       case STRING_LITERAL:
@@ -3479,6 +4398,37 @@ final StringBuffer buff = new StringBuffer();
       case LPAREN:
       case LBRACE:
       case SEMICOLON:
+      case DOLLAR_ID:
+        ;
+        break;
+      default:
+        jj_la1[112] = jj_gen;
+        break label_36;
+      }
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case IF:
+      case ARRAY:
+      case BREAK:
+      case LIST:
+      case PRINT:
+      case ECHO:
+      case INCLUDE:
+      case REQUIRE:
+      case INCLUDE_ONCE:
+      case REQUIRE_ONCE:
+      case GLOBAL:
+      case STATIC:
+      case CONTINUE:
+      case DO:
+      case FOR:
+      case NEW:
+      case NULL:
+      case RETURN:
+      case SWITCH:
+      case TRUE:
+      case FALSE:
+      case WHILE:
+      case FOREACH:
       case AT:
       case DOLLAR:
       case BANG:
@@ -3487,41 +4437,73 @@ final StringBuffer buff = new StringBuffer();
       case PLUS:
       case MINUS:
       case BIT_AND:
+      case INTEGER_LITERAL:
+      case FLOATING_POINT_LITERAL:
+      case STRING_LITERAL:
+      case IDENTIFIER:
+      case LPAREN:
+      case LBRACE:
+      case SEMICOLON:
       case DOLLAR_ID:
-        ;
+        statement = Statement();
+                                             list.add(statement);
+        break;
+      case PHPEND:
+        statement = htmlBlock();
+                                             list.add(statement);
         break;
       default:
-        jj_la1[106] = jj_gen;
-        break label_34;
+        jj_la1[113] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
       }
-      Statement();
     }
+  Statement[] stmtsArray = new Statement[list.size()];
+  list.toArray(stmtsArray);
+  {if (true) return new Else(stmtsArray,pos,SimpleCharStream.getPosition());}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void ElseIfStatement() throws ParseException {
+  static final public ElseIf ElseIfStatement() throws ParseException {
+  Expression condition;
+  Statement statement;
+  final ArrayList list = new ArrayList();
+  final int pos = SimpleCharStream.getPosition();
     jj_consume_token(ELSEIF);
-    Condition("elseif");
-    Statement();
+    condition = Condition("elseif");
+    statement = Statement();
+                                                                    list.add(statement);/*todo:do better*/
+  Statement[] stmtsArray = new Statement[list.size()];
+  list.toArray(stmtsArray);
+  {if (true) return new ElseIf(condition,stmtsArray,pos,SimpleCharStream.getPosition());}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void WhileStatement() throws ParseException {
-  final Token token;
-  final int pos = jj_input_stream.getPosition();
-    token = jj_consume_token(WHILE);
-    Condition("while");
-    WhileStatement0(pos,pos + token.image.length());
+  static final public WhileStatement WhileStatement() throws ParseException {
+  final Expression condition;
+  final Statement action;
+  final int pos = SimpleCharStream.getPosition();
+    jj_consume_token(WHILE);
+    condition = Condition("while");
+    action = WhileStatement0(pos,pos + 5);
+     {if (true) return new WhileStatement(condition,action,pos,SimpleCharStream.getPosition());}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void WhileStatement0(final int start, final int end) throws ParseException {
+  static final public Statement WhileStatement0(final int start, final int end) throws ParseException {
+  Statement statement;
+  final ArrayList stmts = new ArrayList();
+  final int pos = SimpleCharStream.getPosition();
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case COLON:
       jj_consume_token(COLON);
-      label_35:
+      label_37:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case IF:
         case ARRAY:
         case BREAK:
+        case LIST:
         case PRINT:
         case ECHO:
         case INCLUDE:
@@ -3530,7 +4512,6 @@ final StringBuffer buff = new StringBuffer();
         case REQUIRE_ONCE:
         case GLOBAL:
         case STATIC:
-        case LIST:
         case CONTINUE:
         case DO:
         case FOR:
@@ -3542,13 +4523,6 @@ final StringBuffer buff = new StringBuffer();
         case FALSE:
         case WHILE:
         case FOREACH:
-        case INTEGER_LITERAL:
-        case FLOATING_POINT_LITERAL:
-        case STRING_LITERAL:
-        case IDENTIFIER:
-        case LPAREN:
-        case LBRACE:
-        case SEMICOLON:
         case AT:
         case DOLLAR:
         case BANG:
@@ -3557,14 +4531,22 @@ final StringBuffer buff = new StringBuffer();
         case PLUS:
         case MINUS:
         case BIT_AND:
+        case INTEGER_LITERAL:
+        case FLOATING_POINT_LITERAL:
+        case STRING_LITERAL:
+        case IDENTIFIER:
+        case LPAREN:
+        case LBRACE:
+        case SEMICOLON:
         case DOLLAR_ID:
           ;
           break;
         default:
-          jj_la1[107] = jj_gen;
-          break label_35;
+          jj_la1[114] = jj_gen;
+          break label_37;
         }
-        Statement();
+        statement = Statement();
+                                    stmts.add(statement);
       }
    try {
   setMarker(fileToParse,
@@ -3586,19 +4568,10 @@ final StringBuffer buff = new StringBuffer();
     {if (true) throw e;}
       }
       try {
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-        case SEMICOLON:
-          jj_consume_token(SEMICOLON);
-          break;
-        case PHPEND:
-          jj_consume_token(PHPEND);
-                             PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);
-          break;
-        default:
-          jj_la1[108] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
-        }
+        jj_consume_token(SEMICOLON);
+    Statement[] stmtsArray = new Statement[stmts.size()];
+    stmts.toArray(stmtsArray);
+    {if (true) return new Block(stmtsArray,pos,SimpleCharStream.getPosition());}
       } catch (ParseException e) {
     errorMessage = "';' expected after 'endwhile' keyword";
     errorLevel   = ERROR;
@@ -3610,6 +4583,7 @@ final StringBuffer buff = new StringBuffer();
     case IF:
     case ARRAY:
     case BREAK:
+    case LIST:
     case PRINT:
     case ECHO:
     case INCLUDE:
@@ -3618,7 +4592,6 @@ final StringBuffer buff = new StringBuffer();
     case REQUIRE_ONCE:
     case GLOBAL:
     case STATIC:
-    case LIST:
     case CONTINUE:
     case DO:
     case FOR:
@@ -3630,13 +4603,6 @@ final StringBuffer buff = new StringBuffer();
     case FALSE:
     case WHILE:
     case FOREACH:
-    case INTEGER_LITERAL:
-    case FLOATING_POINT_LITERAL:
-    case STRING_LITERAL:
-    case IDENTIFIER:
-    case LPAREN:
-    case LBRACE:
-    case SEMICOLON:
     case AT:
     case DOLLAR:
     case BANG:
@@ -3645,45 +4611,52 @@ final StringBuffer buff = new StringBuffer();
     case PLUS:
     case MINUS:
     case BIT_AND:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case STRING_LITERAL:
+    case IDENTIFIER:
+    case LPAREN:
+    case LBRACE:
+    case SEMICOLON:
     case DOLLAR_ID:
-      Statement();
+      statement = Statement();
+   {if (true) return statement;}
       break;
     default:
-      jj_la1[109] = jj_gen;
+      jj_la1[115] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void DoStatement() throws ParseException {
+  static final public DoStatement DoStatement() throws ParseException {
+  final Statement action;
+  final Expression condition;
+  final int pos = SimpleCharStream.getPosition();
     jj_consume_token(DO);
-    Statement();
+    action = Statement();
     jj_consume_token(WHILE);
-    Condition("while");
+    condition = Condition("while");
     try {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case SEMICOLON:
-        jj_consume_token(SEMICOLON);
-        break;
-      case PHPEND:
-        jj_consume_token(PHPEND);
-                             PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);
-        break;
-      default:
-        jj_la1[110] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
-      }
+      jj_consume_token(SEMICOLON);
+     {if (true) return new DoStatement(condition,action,pos,SimpleCharStream.getPosition());}
     } catch (ParseException e) {
-    errorMessage = "';' expected";
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
     errorLevel   = ERROR;
     errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd   = jj_input_stream.getPosition() + 1;
     {if (true) throw e;}
     }
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void ForeachStatement() throws ParseException {
+  static final public ForeachStatement ForeachStatement() throws ParseException {
+  Statement statement;
+  Expression expression;
+  final StringBuffer buff = new StringBuffer();
+  final int pos = SimpleCharStream.getPosition();
+  ArrayVariableDeclaration variable;
     jj_consume_token(FOREACH);
     try {
       jj_consume_token(LPAREN);
@@ -3695,7 +4668,7 @@ final StringBuffer buff = new StringBuffer();
     {if (true) throw e;}
     }
     try {
-      Variable();
+      expression = Expression();
     } catch (ParseException e) {
     errorMessage = "variable expected";
     errorLevel   = ERROR;
@@ -3703,15 +4676,6 @@ final StringBuffer buff = new StringBuffer();
     errorEnd   = jj_input_stream.getPosition() + 1;
     {if (true) throw e;}
     }
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case CLASSACCESS:
-    case LBRACKET:
-      VariableSuffix();
-      break;
-    default:
-      jj_la1[111] = jj_gen;
-      ;
-    }
     try {
       jj_consume_token(AS);
     } catch (ParseException e) {
@@ -3722,7 +4686,7 @@ final StringBuffer buff = new StringBuffer();
     {if (true) throw e;}
     }
     try {
-      Variable();
+      variable = ArrayVariable();
     } catch (ParseException e) {
     errorMessage = "variable expected";
     errorLevel   = ERROR;
@@ -3730,15 +4694,6 @@ final StringBuffer buff = new StringBuffer();
     errorEnd   = jj_input_stream.getPosition() + 1;
     {if (true) throw e;}
     }
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case ARRAYASSIGN:
-      jj_consume_token(ARRAYASSIGN);
-      Expression();
-      break;
-    default:
-      jj_la1[112] = jj_gen;
-      ;
-    }
     try {
       jj_consume_token(RPAREN);
     } catch (ParseException e) {
@@ -3749,7 +4704,7 @@ final StringBuffer buff = new StringBuffer();
     {if (true) throw e;}
     }
     try {
-      Statement();
+      statement = Statement();
     } catch (ParseException e) {
     if (errorMessage != null) {if (true) throw e;}
     errorMessage = "statement expected";
@@ -3758,11 +4713,23 @@ final StringBuffer buff = new StringBuffer();
     errorEnd   = jj_input_stream.getPosition() + 1;
     {if (true) throw e;}
     }
+   {if (true) return new ForeachStatement(expression,
+                               variable,
+                               statement,
+                               pos,
+                               SimpleCharStream.getPosition());}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void ForStatement() throws ParseException {
+  static final public ForStatement ForStatement() throws ParseException {
 final Token token;
-final int pos = jj_input_stream.getPosition();
+final int pos = SimpleCharStream.getPosition();
+Statement[] initializations = null;
+Expression condition = null;
+Statement[] increments = null;
+Statement action;
+final ArrayList list = new ArrayList();
+final int startBlock, endBlock;
     token = jj_consume_token(FOR);
     try {
       jj_consume_token(LPAREN);
@@ -3776,31 +4743,26 @@ final int pos = jj_input_stream.getPosition();
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case ARRAY:
     case NEW:
-    case IDENTIFIER:
     case DOLLAR:
     case INCR:
     case DECR:
+    case IDENTIFIER:
     case DOLLAR_ID:
-      ForInit();
+      initializations = ForInit();
       break;
     default:
-      jj_la1[113] = jj_gen;
+      jj_la1[116] = jj_gen;
       ;
     }
     jj_consume_token(SEMICOLON);
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case ARRAY:
-    case PRINT:
     case LIST:
+    case PRINT:
     case NEW:
     case NULL:
     case TRUE:
     case FALSE:
-    case INTEGER_LITERAL:
-    case FLOATING_POINT_LITERAL:
-    case STRING_LITERAL:
-    case IDENTIFIER:
-    case LPAREN:
     case AT:
     case DOLLAR:
     case BANG:
@@ -3809,26 +4771,31 @@ final int pos = jj_input_stream.getPosition();
     case PLUS:
     case MINUS:
     case BIT_AND:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case STRING_LITERAL:
+    case IDENTIFIER:
+    case LPAREN:
     case DOLLAR_ID:
-      Expression();
+      condition = Expression();
       break;
     default:
-      jj_la1[114] = jj_gen;
+      jj_la1[117] = jj_gen;
       ;
     }
     jj_consume_token(SEMICOLON);
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case ARRAY:
     case NEW:
-    case IDENTIFIER:
     case DOLLAR:
     case INCR:
     case DECR:
+    case IDENTIFIER:
     case DOLLAR_ID:
-      StatementExpressionList();
+      increments = StatementExpressionList();
       break;
     default:
-      jj_la1[115] = jj_gen;
+      jj_la1[118] = jj_gen;
       ;
     }
     jj_consume_token(RPAREN);
@@ -3836,6 +4803,7 @@ final int pos = jj_input_stream.getPosition();
     case IF:
     case ARRAY:
     case BREAK:
+    case LIST:
     case PRINT:
     case ECHO:
     case INCLUDE:
@@ -3844,7 +4812,6 @@ final int pos = jj_input_stream.getPosition();
     case REQUIRE_ONCE:
     case GLOBAL:
     case STATIC:
-    case LIST:
     case CONTINUE:
     case DO:
     case FOR:
@@ -3856,13 +4823,6 @@ final int pos = jj_input_stream.getPosition();
     case FALSE:
     case WHILE:
     case FOREACH:
-    case INTEGER_LITERAL:
-    case FLOATING_POINT_LITERAL:
-    case STRING_LITERAL:
-    case IDENTIFIER:
-    case LPAREN:
-    case LBRACE:
-    case SEMICOLON:
     case AT:
     case DOLLAR:
     case BANG:
@@ -3871,17 +4831,27 @@ final int pos = jj_input_stream.getPosition();
     case PLUS:
     case MINUS:
     case BIT_AND:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case STRING_LITERAL:
+    case IDENTIFIER:
+    case LPAREN:
+    case LBRACE:
+    case SEMICOLON:
     case DOLLAR_ID:
-      Statement();
+      action = Statement();
+       {if (true) return new ForStatement(initializations,condition,increments,action,pos,SimpleCharStream.getPosition());}
       break;
     case COLON:
       jj_consume_token(COLON);
-      label_36:
+       startBlock = SimpleCharStream.getPosition();
+      label_38:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case IF:
         case ARRAY:
         case BREAK:
+        case LIST:
         case PRINT:
         case ECHO:
         case INCLUDE:
@@ -3890,7 +4860,6 @@ final int pos = jj_input_stream.getPosition();
         case REQUIRE_ONCE:
         case GLOBAL:
         case STATIC:
-        case LIST:
         case CONTINUE:
         case DO:
         case FOR:
@@ -3902,13 +4871,6 @@ final int pos = jj_input_stream.getPosition();
         case FALSE:
         case WHILE:
         case FOREACH:
-        case INTEGER_LITERAL:
-        case FLOATING_POINT_LITERAL:
-        case STRING_LITERAL:
-        case IDENTIFIER:
-        case LPAREN:
-        case LBRACE:
-        case SEMICOLON:
         case AT:
         case DOLLAR:
         case BANG:
@@ -3917,14 +4879,22 @@ final int pos = jj_input_stream.getPosition();
         case PLUS:
         case MINUS:
         case BIT_AND:
+        case INTEGER_LITERAL:
+        case FLOATING_POINT_LITERAL:
+        case STRING_LITERAL:
+        case IDENTIFIER:
+        case LPAREN:
+        case LBRACE:
+        case SEMICOLON:
         case DOLLAR_ID:
           ;
           break;
         default:
-          jj_la1[116] = jj_gen;
-          break label_36;
+          jj_la1[119] = jj_gen;
+          break label_38;
         }
-        Statement();
+        action = Statement();
+                             list.add(action);
       }
         try {
         setMarker(fileToParse,
@@ -3936,6 +4906,7 @@ final int pos = jj_input_stream.getPosition();
         } catch (CoreException e) {
           PHPeclipsePlugin.log(e);
         }
+       endBlock = SimpleCharStream.getPosition();
       try {
         jj_consume_token(ENDFOR);
       } catch (ParseException e) {
@@ -3947,6 +4918,9 @@ final int pos = jj_input_stream.getPosition();
       }
       try {
         jj_consume_token(SEMICOLON);
+        Statement[] stmtsArray = new Statement[list.size()];
+        list.toArray(stmtsArray);
+        {if (true) return new ForStatement(initializations,condition,increments,new Block(stmtsArray,startBlock,endBlock),pos,SimpleCharStream.getPosition());}
       } catch (ParseException e) {
         errorMessage = "';' expected after 'endfor' keyword";
         errorLevel   = ERROR;
@@ -3956,63 +4930,99 @@ final int pos = jj_input_stream.getPosition();
       }
       break;
     default:
-      jj_la1[117] = jj_gen;
+      jj_la1[120] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void ForInit() throws ParseException {
-    if (jj_2_7(2147483647)) {
-      LocalVariableDeclaration();
+  static final public Statement[] ForInit() throws ParseException {
+  Statement[] statements;
+    if (jj_2_8(2147483647)) {
+      statements = LocalVariableDeclaration();
+   {if (true) return statements;}
     } else {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case ARRAY:
       case NEW:
-      case IDENTIFIER:
       case DOLLAR:
       case INCR:
       case DECR:
+      case IDENTIFIER:
       case DOLLAR_ID:
-        StatementExpressionList();
+        statements = StatementExpressionList();
+   {if (true) return statements;}
         break;
       default:
-        jj_la1[118] = jj_gen;
+        jj_la1[121] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
     }
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void StatementExpressionList() throws ParseException {
-    StatementExpression();
-    label_37:
+  static final public Statement[] StatementExpressionList() throws ParseException {
+  final ArrayList list = new ArrayList();
+  Statement expr;
+    expr = StatementExpression();
+                                  list.add(expr);
+    label_39:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case COMMA:
         ;
         break;
       default:
-        jj_la1[119] = jj_gen;
-        break label_37;
+        jj_la1[122] = jj_gen;
+        break label_39;
       }
       jj_consume_token(COMMA);
       StatementExpression();
+                                  list.add(expr);
     }
+  Statement[] stmtsArray = new Statement[list.size()];
+  list.toArray(stmtsArray);
+  {if (true) return stmtsArray;}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void ContinueStatement() throws ParseException {
+  static final public Continue ContinueStatement() throws ParseException {
+  Expression expr = null;
+  final int pos = SimpleCharStream.getPosition();
     jj_consume_token(CONTINUE);
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case ARRAY:
+    case LIST:
+    case PRINT:
+    case NEW:
+    case NULL:
+    case TRUE:
+    case FALSE:
+    case AT:
+    case DOLLAR:
+    case BANG:
+    case INCR:
+    case DECR:
+    case PLUS:
+    case MINUS:
+    case BIT_AND:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case STRING_LITERAL:
     case IDENTIFIER:
-      jj_consume_token(IDENTIFIER);
+    case LPAREN:
+    case DOLLAR_ID:
+      expr = Expression();
       break;
     default:
-      jj_la1[120] = jj_gen;
+      jj_la1[123] = jj_gen;
       ;
     }
     try {
       jj_consume_token(SEMICOLON);
+     {if (true) return new Continue(expr,pos,SimpleCharStream.getPosition());}
     } catch (ParseException e) {
     errorMessage = "';' expected after 'continue' statement";
     errorLevel   = ERROR;
@@ -4020,23 +5030,21 @@ final int pos = jj_input_stream.getPosition();
     errorEnd   = jj_input_stream.getPosition() + 1;
     {if (true) throw e;}
     }
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void ReturnStatement() throws ParseException {
+  static final public ReturnStatement ReturnStatement() throws ParseException {
+  Expression expr = null;
+  final int pos = SimpleCharStream.getPosition();
     jj_consume_token(RETURN);
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case ARRAY:
-    case PRINT:
     case LIST:
+    case PRINT:
     case NEW:
     case NULL:
     case TRUE:
     case FALSE:
-    case INTEGER_LITERAL:
-    case FLOATING_POINT_LITERAL:
-    case STRING_LITERAL:
-    case IDENTIFIER:
-    case LPAREN:
     case AT:
     case DOLLAR:
     case BANG:
@@ -4045,15 +5053,21 @@ final int pos = jj_input_stream.getPosition();
     case PLUS:
     case MINUS:
     case BIT_AND:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case STRING_LITERAL:
+    case IDENTIFIER:
+    case LPAREN:
     case DOLLAR_ID:
-      Expression();
+      expr = Expression();
       break;
     default:
-      jj_la1[121] = jj_gen;
+      jj_la1[124] = jj_gen;
       ;
     }
     try {
       jj_consume_token(SEMICOLON);
+     {if (true) return new ReturnStatement(expr,pos,SimpleCharStream.getPosition());}
     } catch (ParseException e) {
     errorMessage = "';' expected after 'return' statement";
     errorLevel   = ERROR;
@@ -4061,6 +5075,7 @@ final int pos = jj_input_stream.getPosition();
     errorEnd   = jj_input_stream.getPosition() + 1;
     {if (true) throw e;}
     }
+    throw new Error("Missing return statement in function");
   }
 
   static final private boolean jj_2_1(int xla) {
@@ -4112,636 +5127,707 @@ final int pos = jj_input_stream.getPosition();
     return retval;
   }
 
-  static final private boolean jj_3R_75() {
-    if (jj_scan_token(HOOK)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_41()) return true;
+  static final private boolean jj_2_8(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    boolean retval = !jj_3_8();
+    jj_save(7, xla);
+    return retval;
+  }
+
+  static final private boolean jj_3R_147() {
+    if (jj_scan_token(REMAINDER)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(COLON)) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_146() {
+    if (jj_scan_token(SLASH)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_66()) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_145() {
+    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_97() {
-    if (jj_scan_token(SC_OR)) return true;
+  static final private boolean jj_3_7() {
+    if (jj_3R_46()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_79() {
+  static final private boolean jj_3R_140() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_97()) {
+    if (jj_3R_145()) {
+    jj_scanpos = xsp;
+    if (jj_3R_146()) {
     jj_scanpos = xsp;
-    if (jj_3R_98()) return true;
+    if (jj_3R_147()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_78()) return true;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_139()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_74() {
-    if (jj_3R_78()) return true;
+  static final private boolean jj_3R_57() {
+    if (jj_3R_50()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_87()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3_6() {
+    if (jj_3R_45()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    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_134() {
+    if (jj_3R_139()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_79()) { jj_scanpos = xsp; break; }
+      if (jj_3R_140()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_177() {
-    if (jj_3R_68()) return true;
+  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;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_176() {
-    if (jj_scan_token(NEW)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_185()) return true;
+  static final private boolean jj_3R_47() {
+    if (jj_3R_57()) 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_179() {
-    if (jj_scan_token(DECR)) return true;
+  static final private boolean jj_3R_142() {
+    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_175() {
-    if (jj_scan_token(IDENTIFIER)) return true;
+  static final private boolean jj_3R_141() {
+    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_170() {
+  static final private boolean jj_3R_135() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_175()) {
-    jj_scanpos = xsp;
-    if (jj_3R_176()) {
+    if (jj_3R_141()) {
     jj_scanpos = xsp;
-    if (jj_3R_177()) return true;
+    if (jj_3R_142()) 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_134()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_106() {
-    if (jj_scan_token(ASSIGN)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_41()) return true;
+  static final private boolean jj_3R_128() {
+    if (jj_3R_134()) 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_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
     return false;
   }
 
-  static final private boolean jj_3R_66() {
-    if (jj_3R_74()) return true;
+  static final private boolean jj_3R_198() {
+    if (jj_scan_token(COMMA)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_75()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_171() {
-    if (jj_scan_token(ARRAY)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_184()) return true;
+  static final private boolean jj_3R_138() {
+    if (jj_scan_token(RUNSIGNEDSHIFT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_92() {
-    if (jj_scan_token(TILDEEQUAL)) 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_178() {
-    if (jj_scan_token(INCR)) return true;
+  static final private boolean jj_3R_137() {
+    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_164() {
-    if (jj_3R_171()) return true;
+  static final private boolean jj_3R_206() {
+    if (jj_scan_token(ASSIGN)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_207()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_172() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_178()) {
-    jj_scanpos = xsp;
-    if (jj_3R_179()) return true;
+  static final private boolean jj_3R_136() {
+    if (jj_scan_token(LSHIFT)) 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_182() {
-    if (jj_3R_183()) return true;
+  static final private boolean jj_3R_197() {
+    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_3R_91() {
-    if (jj_scan_token(DOTASSIGN)) return true;
+  static final private boolean jj_3R_129() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_136()) {
+    jj_scanpos = xsp;
+    if (jj_3R_137()) {
+    jj_scanpos = xsp;
+    if (jj_3R_138()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_128()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_90() {
-    if (jj_scan_token(ORASSIGN)) return true;
+  static final private boolean jj_3R_205() {
+    if (jj_scan_token(BIT_AND)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_163() {
-    if (jj_3R_170()) return true;
+  static final private boolean jj_3R_121() {
+    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_182()) { 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_89() {
-    if (jj_scan_token(XORASSIGN)) return true;
+  static final private boolean jj_3R_203() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_205()) jj_scanpos = xsp;
+    else 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;
+    xsp = jj_scanpos;
+    if (jj_3R_206()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_88() {
-    if (jj_scan_token(ANDASSIGN)) return true;
+  static final private boolean jj_3R_216() {
+    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_105() {
-    if (jj_scan_token(COMMA)) return true;
+  static final private boolean jj_3R_192() {
+    if (jj_scan_token(LPAREN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_68()) return true;
+    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_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_186() {
-    if (jj_3R_183()) return true;
+  static final private boolean jj_3R_214() {
+    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_87() {
-    if (jj_scan_token(RSIGNEDSHIFTASSIGN)) return true;
+  static final private boolean jj_3R_133() {
+    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_86() {
-    if (jj_scan_token(LSHIFTASSIGN)) return true;
+  static final private boolean jj_3R_132() {
+    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_104() {
-    if (jj_3R_68()) return true;
+  static final private boolean jj_3R_131() {
+    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_85() {
-    if (jj_scan_token(MINUSASSIGN)) return true;
+  static final private boolean jj_3R_130() {
+    if (jj_scan_token(LT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3_4() {
-    if (jj_scan_token(IDENTIFIER)) return true;
+  static final private boolean jj_3R_122() {
+    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()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(STATICCLASSACCESS)) return true;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_121()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_185()) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_119() {
+    if (jj_3R_121()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_186()) { jj_scanpos = xsp; break; }
+      if (jj_3R_122()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_159() {
+  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;
+    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;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3_4()) {
-    jj_scanpos = xsp;
-    if (jj_3R_163()) {
-    jj_scanpos = xsp;
-    if (jj_3R_164()) 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_201()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_84() {
-    if (jj_scan_token(PLUSASSIGN)) return true;
+  static final private boolean jj_3R_204() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_203()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_83() {
-    if (jj_scan_token(REMASSIGN)) return true;
+  static final private boolean jj_3R_202() {
+    if (jj_3R_203()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_204()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
     return false;
   }
 
-  static final private boolean jj_3R_82() {
-    if (jj_scan_token(SLASHASSIGN)) return true;
+  static final private boolean jj_3R_212() {
+    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_81() {
-    if (jj_scan_token(STARASSIGN)) return true;
+  static final private boolean jj_3R_215() {
+    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_80() {
-    if (jj_scan_token(ASSIGN)) return true;
+  static final private boolean jj_3R_211() {
+    if (jj_3R_182()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_76() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_80()) {
-    jj_scanpos = xsp;
-    if (jj_3R_81()) {
-    jj_scanpos = xsp;
-    if (jj_3R_82()) {
-    jj_scanpos = xsp;
-    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()) {
-    jj_scanpos = xsp;
-    if (jj_3R_87()) {
-    jj_scanpos = xsp;
-    if (jj_3R_88()) {
-    jj_scanpos = xsp;
-    if (jj_3R_89()) {
-    jj_scanpos = xsp;
-    if (jj_3R_90()) {
-    jj_scanpos = xsp;
-    if (jj_3R_91()) {
-    jj_scanpos = xsp;
-    if (jj_3R_92()) return true;
+  static final private boolean jj_3R_200() {
+    if (jj_3R_202()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_65() {
-    if (jj_scan_token(LIST)) return true;
+  static final private boolean jj_3R_213() {
+    if (jj_scan_token(INTEGER_LITERAL)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_210() {
+    if (jj_scan_token(PLUS)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_104()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    xsp = jj_scanpos;
-    if (jj_3R_105()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(RPAREN)) return true;
+    if (jj_3R_215()) {
+    jj_scanpos = xsp;
+    if (jj_3R_216()) 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;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_161() {
-    if (jj_3R_159()) return true;
+  static final private boolean jj_3R_127() {
+    if (jj_scan_token(TRIPLEEQUAL)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_172()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_64() {
-    if (jj_scan_token(PRINT)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_41()) return true;
+  static final private boolean jj_3R_126() {
+    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_67() {
-    if (jj_3R_76()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_41()) return true;
+  static final private boolean jj_3R_125() {
+    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_160() {
-    if (jj_scan_token(LPAREN)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_40()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(RPAREN)) return true;
+  static final private boolean jj_3R_124() {
+    if (jj_scan_token(DIF)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_134()) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_123() {
+    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_59() {
-    if (jj_3R_66()) return true;
+  static final private boolean jj_3R_93() {
+    if (jj_3R_52()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_67()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_58() {
-    if (jj_3R_65()) return true;
+  static final private boolean jj_3R_46() {
+    if (jj_scan_token(IDENTIFIER)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_scan_token(COLON)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_41() {
+  static final private boolean jj_3R_209() {
+    if (jj_scan_token(MINUS)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_57()) {
-    jj_scanpos = xsp;
-    if (jj_3R_58()) {
+    if (jj_3R_213()) {
     jj_scanpos = xsp;
-    if (jj_3R_59()) return true;
+    if (jj_3R_214()) 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_57() {
-    if (jj_3R_64()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3_3() {
+  static final private boolean jj_3R_199() {
     if (jj_scan_token(LPAREN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_40()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    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;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_158() {
-    if (jj_scan_token(LPAREN)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_41()) return true;
+  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;
-    if (jj_scan_token(RPAREN)) 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_119()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_56() {
-    if (jj_scan_token(OBJECT)) return true;
+  static final private boolean jj_3R_208() {
+    if (jj_3R_169()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_157() {
-    if (jj_3R_162()) return true;
+  static final private boolean jj_3R_207() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_208()) {
+    jj_scanpos = xsp;
+    if (jj_3R_209()) {
+    jj_scanpos = xsp;
+    if (jj_3R_210()) {
+    jj_scanpos = xsp;
+    if (jj_3R_211()) {
+    jj_scanpos = xsp;
+    if (jj_3R_212()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_55() {
-    if (jj_scan_token(INTEGER)) return true;
+  static final private boolean jj_3R_117() {
+    if (jj_3R_119()) 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_156() {
-    if (jj_3R_161()) return true;
+  static final private boolean jj_3_8() {
+    if (jj_3R_47()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_54() {
-    if (jj_scan_token(INT)) return true;
+  static final private boolean jj_3R_177() {
+    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_155() {
-    if (jj_3R_160()) return true;
+  static final private boolean jj_3R_108() {
+    if (jj_scan_token(LBRACE)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_45()) 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_53() {
-    if (jj_scan_token(FLOAT)) return true;
+  static final private boolean jj_3R_176() {
+    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_153() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_154()) {
-    jj_scanpos = xsp;
-    if (jj_3R_155()) {
-    jj_scanpos = xsp;
-    if (jj_3R_156()) {
-    jj_scanpos = xsp;
-    if (jj_3R_157()) {
-    jj_scanpos = xsp;
-    if (jj_3R_158()) return true;
+  static final private boolean jj_3R_91() {
+    if (jj_scan_token(DOLLAR_ID)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_154() {
-    if (jj_scan_token(BANG)) return true;
+  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_134()) return true;
+    if (jj_3R_117()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_52() {
-    if (jj_scan_token(DOUBLE)) return true;
+  static final private boolean jj_3R_175() {
+    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_51() {
-    if (jj_scan_token(REAL)) return true;
+  static final private boolean jj_3R_174() {
+    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_50() {
-    if (jj_scan_token(BOOLEAN)) return true;
+  static final private boolean jj_3R_115() {
+    if (jj_3R_117()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_118()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
     return false;
   }
 
-  static final private boolean jj_3R_152() {
-    if (jj_scan_token(DECR)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_159()) return true;
+  static final private boolean jj_3R_173() {
+    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_49() {
-    if (jj_scan_token(BOOL)) return true;
+  static final private boolean jj_3R_90() {
+    if (jj_scan_token(DOLLAR)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_59()) 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_169() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_48()) {
+    if (jj_3R_172()) {
     jj_scanpos = xsp;
-    if (jj_3R_49()) {
+    if (jj_3R_173()) {
     jj_scanpos = xsp;
-    if (jj_3R_50()) {
+    if (jj_3R_174()) {
     jj_scanpos = xsp;
-    if (jj_3R_51()) {
-    jj_scanpos = xsp;
-    if (jj_3R_52()) {
-    jj_scanpos = xsp;
-    if (jj_3R_53()) {
-    jj_scanpos = xsp;
-    if (jj_3R_54()) {
+    if (jj_3R_175()) {
     jj_scanpos = xsp;
-    if (jj_3R_55()) {
+    if (jj_3R_176()) {
     jj_scanpos = xsp;
-    if (jj_3R_56()) return true;
+    if (jj_3R_177()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_48() {
-    if (jj_scan_token(STRING)) return true;
+  static final private boolean jj_3R_172() {
+    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_151() {
-    if (jj_scan_token(INCR)) return true;
+  static final private boolean jj_3R_116() {
+    if (jj_scan_token(XOR)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_159()) return true;
+    if (jj_3R_115()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_150() {
-    if (jj_scan_token(MINUS)) return true;
+  static final private boolean jj_3R_92() {
+    if (jj_3R_45()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_148() {
-    if (jj_3R_153()) return true;
+  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;
     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_147() {
-    if (jj_3R_152()) return true;
+  static final private boolean jj_3R_113() {
+    if (jj_3R_115()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_116()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
     return false;
   }
 
-  static final private boolean jj_3R_142() {
-    if (jj_scan_token(REM)) return true;
+  static final private boolean jj_3R_89() {
+    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_108()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_146() {
-    if (jj_3R_151()) return true;
+  static final private boolean jj_3R_88() {
+    if (jj_scan_token(LBRACE)) 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(PLUS)) return true;
+    if (jj_3R_45()) 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_143() {
+  static final private boolean jj_3R_59() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_145()) {
+    if (jj_3R_88()) {
     jj_scanpos = xsp;
-    if (jj_3R_146()) {
+    if (jj_3R_89()) {
     jj_scanpos = xsp;
-    if (jj_3R_147()) {
+    if (jj_3R_90()) {
     jj_scanpos = xsp;
-    if (jj_3R_148()) return true;
+    if (jj_3R_91()) 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;
@@ -4749,869 +5835,971 @@ final int pos = jj_input_stream.getPosition();
     return false;
   }
 
-  static final private boolean jj_3R_145() {
+  static final private boolean jj_3R_49() {
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_149()) {
-    jj_scanpos = xsp;
-    if (jj_3R_150()) return true;
+    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_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;
+    return false;
+  }
+
+  static final private boolean jj_3R_114() {
+    if (jj_scan_token(BIT_OR)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_113()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_144() {
-    if (jj_scan_token(AT)) return true;
+  static final private boolean jj_3R_98() {
+    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_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_139() {
+  static final private boolean jj_3R_109() {
+    if (jj_3R_113()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_144()) { jj_scanpos = xsp; break; }
+      if (jj_3R_114()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
-    if (jj_3R_143()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_141() {
-    if (jj_scan_token(SLASH)) return true;
+  static final private boolean jj_3R_95() {
+    if (jj_scan_token(DOLLAR)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_134() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_138()) {
-    jj_scanpos = xsp;
-    if (jj_3R_139()) return true;
+    if (jj_3R_59()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_138() {
-    if (jj_scan_token(BIT_AND)) return true;
+  static final private boolean jj_3R_110() {
+    if (jj_scan_token(DOT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_143()) return true;
+    if (jj_3R_109()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_133() {
-    if (jj_scan_token(RUNSIGNEDSHIFT)) return true;
+  static final private boolean jj_3R_48() {
+    if (jj_scan_token(CLASSACCESS)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_140() {
-    if (jj_scan_token(STAR)) return true;
+    if (jj_3R_59()) 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_40() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_140()) {
-    jj_scanpos = xsp;
-    if (jj_3R_141()) {
+    if (jj_3R_48()) {
     jj_scanpos = xsp;
-    if (jj_3R_142()) return true;
+    if (jj_3R_49()) 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_134()) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_104() {
+    if (jj_3R_109()) 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_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
     return false;
   }
 
-  static final private boolean jj_3R_137() {
-    if (jj_scan_token(MINUS)) return true;
+  static final private boolean jj_3R_94() {
+    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;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_128() {
-    if (jj_scan_token(GE)) return true;
+  static final private boolean jj_3R_61() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_94()) {
+    jj_scanpos = xsp;
+    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;
     return false;
   }
 
-  static final private boolean jj_3R_129() {
-    if (jj_3R_134()) return true;
+  static final private boolean jj_3R_196() {
+    if (jj_3R_40()) 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_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
     return false;
   }
 
-  static final private boolean jj_3R_43() {
-    if (jj_scan_token(PHPEND)) return true;
+  static final private boolean jj_3R_112() {
+    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_132() {
-    if (jj_scan_token(RSIGNEDSHIFT)) return true;
+  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_127() {
-    if (jj_scan_token(LE)) return true;
+  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;
     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_136() {
-    if (jj_scan_token(PLUS)) return true;
+  static final private boolean jj_3R_111() {
+    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_130() {
+  static final private boolean jj_3R_105() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_136()) {
+    if (jj_3R_111()) {
     jj_scanpos = xsp;
-    if (jj_3R_137()) return true;
+    if (jj_3R_112()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_129()) return true;
+    if (jj_3R_104()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3_6() {
-    if (jj_3R_44()) return true;
+  static final private boolean jj_3R_97() {
+    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_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_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_123() {
-    if (jj_3R_129()) return true;
+  static final private boolean jj_3R_102() {
+    if (jj_3R_104()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_130()) { jj_scanpos = xsp; break; }
+      if (jj_3R_105()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_42() {
-    if (jj_scan_token(SEMICOLON)) return true;
+  static final private boolean jj_3R_187() {
+    if (jj_3R_50()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3_5() {
-    if (jj_3R_41()) return true;
+  static final private boolean jj_3R_186() {
+    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_178() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_42()) {
+    if (jj_3R_186()) {
     jj_scanpos = xsp;
-    if (jj_3R_43()) return true;
+    if (jj_3R_187()) 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_126() {
-    if (jj_scan_token(GT)) return true;
+  static final private boolean jj_3R_107() {
+    if (jj_scan_token(_ORL)) 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_39()) return true;
+  static final private boolean jj_3R_106() {
+    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_131() {
-    if (jj_scan_token(LSHIFT)) 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_124() {
+  static final private boolean jj_3R_103() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_131()) {
-    jj_scanpos = xsp;
-    if (jj_3R_132()) {
+    if (jj_3R_106()) {
     jj_scanpos = xsp;
-    if (jj_3R_133()) return true;
+    if (jj_3R_107()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_123()) return true;
+    if (jj_3R_102()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_192() {
-    if (jj_3R_39()) return true;
+  static final private boolean jj_3R_96() {
+    if (jj_3R_102()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3_2()) { jj_scanpos = xsp; break; }
+      if (jj_3R_103()) { 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_3R_123()) return true;
+  static final private boolean jj_3R_50() {
+    if (jj_3R_61()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_124()) { jj_scanpos = xsp; break; }
+      if (jj_3_1()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_184() {
-    if (jj_scan_token(LPAREN)) return true;
+  static final private boolean jj_3R_86() {
+    if (jj_3R_96()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_192()) jj_scanpos = xsp;
+    if (jj_3R_97()) jj_scanpos = xsp;
     else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(RPAREN)) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_191() {
+    if (jj_3R_50()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_196() {
-    if (jj_scan_token(COMMA)) return true;
+  static final private boolean jj_3R_190() {
+    if (jj_scan_token(NEW)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_41()) return true;
+    if (jj_3R_178()) 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(LT)) return true;
+  static final private boolean jj_3R_74() {
+    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_117() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_125()) {
-    jj_scanpos = xsp;
-    if (jj_3R_126()) {
-    jj_scanpos = xsp;
-    if (jj_3R_127()) {
-    jj_scanpos = xsp;
-    if (jj_3R_128()) return true;
+  static final private boolean jj_3R_101() {
+    if (jj_scan_token(ASSIGN)) 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_116()) return true;
+    if (jj_3R_45()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_195() {
-    if (jj_3R_41()) return true;
+  static final private boolean jj_3R_73() {
+    if (jj_scan_token(DOTASSIGN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_196()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
     return false;
   }
 
-  static final private boolean jj_3R_114() {
-    if (jj_3R_116()) return true;
+  static final private boolean jj_3R_72() {
+    if (jj_scan_token(ORASSIGN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      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_194() {
-    if (jj_scan_token(ARRAYASSIGN)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_41()) return true;
+  static final private boolean jj_3R_189() {
+    if (jj_scan_token(IDENTIFIER)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_39() {
-    if (jj_3R_41()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+  static final private boolean jj_3R_180() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_194()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3_7() {
-    if (jj_3R_45()) return true;
+    if (jj_3R_189()) {
+    jj_scanpos = xsp;
+    if (jj_3R_190()) {
+    jj_scanpos = xsp;
+    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;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_193() {
-    if (jj_3R_195()) return true;
+  static final private boolean jj_3R_71() {
+    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_122() {
-    if (jj_scan_token(TRIPLEEQUAL)) return true;
+  static final private boolean jj_3R_70() {
+    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_191() {
-    if (jj_scan_token(LPAREN)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_193()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(RPAREN)) return true;
+  static final private boolean jj_3R_69() {
+    if (jj_scan_token(RSIGNEDSHIFTASSIGN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_121() {
-    if (jj_scan_token(BANGDOUBLEEQUAL)) return true;
+  static final private boolean jj_3R_68() {
+    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_120() {
-    if (jj_scan_token(NE)) return true;
+  static final private boolean jj_3R_67() {
+    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_69() {
-    if (jj_scan_token(ASSIGN)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_41()) return true;
+  static final private boolean jj_3R_66() {
+    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_119() {
-    if (jj_scan_token(DIF)) return true;
+  static final private boolean jj_3R_65() {
+    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_118() {
-    if (jj_scan_token(EQ)) return true;
+  static final private boolean jj_3R_64() {
+    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_61() {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_60()) return true;
+  static final private boolean jj_3R_63() {
+    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_115() {
+  static final private boolean jj_3R_51() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_118()) {
+    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()) {
+    jj_scanpos = xsp;
+    if (jj_3R_67()) {
+    jj_scanpos = xsp;
+    if (jj_3R_68()) {
+    jj_scanpos = xsp;
+    if (jj_3R_69()) {
+    jj_scanpos = xsp;
+    if (jj_3R_70()) {
     jj_scanpos = xsp;
-    if (jj_3R_119()) {
+    if (jj_3R_71()) {
     jj_scanpos = xsp;
-    if (jj_3R_120()) {
+    if (jj_3R_72()) {
     jj_scanpos = xsp;
-    if (jj_3R_121()) {
+    if (jj_3R_73()) {
     jj_scanpos = xsp;
-    if (jj_3R_122()) return true;
+    if (jj_3R_74()) 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_114()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_174() {
-    if (jj_scan_token(NULL)) return true;
+  static final private boolean jj_3R_62() {
+    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_112() {
-    if (jj_3R_114()) return true;
+  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;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_115()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
     return false;
   }
 
-  static final private boolean jj_3R_109() {
-    if (jj_scan_token(LBRACE)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_41()) return true;
+  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_scan_token(RBRACE)) return true;
+    if (jj_3R_50()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_181() {
-    if (jj_scan_token(FALSE)) return true;
+  static final private boolean jj_3R_171() {
+    if (jj_3R_182()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_180() {
-    if (jj_scan_token(TRUE)) return true;
+  static final private boolean jj_3R_99() {
+    if (jj_3R_50()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_173() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_180()) {
-    jj_scanpos = xsp;
-    if (jj_3R_181()) return true;
+  static final private boolean jj_3R_181() {
+    if (jj_3R_188()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_73() {
-    if (jj_scan_token(DOLLAR_ID)) return true;
+  static final private boolean jj_3R_170() {
+    if (jj_3R_180()) 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_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
     return false;
   }
 
-  static final private boolean jj_3R_113() {
-    if (jj_scan_token(BIT_AND)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_112()) return true;
+  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_72() {
-    if (jj_scan_token(DOLLAR)) return true;
+  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_62()) 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_169() {
-    if (jj_3R_174()) return true;
+    if (jj_3R_45()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_60() {
-    if (jj_3R_68()) return true;
+  static final private boolean jj_3_5() {
+    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_69()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_168() {
-    if (jj_3R_173()) return true;
+    if (jj_scan_token(STATICCLASSACCESS)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_110() {
-    if (jj_3R_112()) return true;
+    if (jj_3R_178()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_113()) { jj_scanpos = xsp; break; }
+      if (jj_3R_179()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_167() {
-    if (jj_scan_token(STRING_LITERAL)) return true;
+  static final private boolean jj_3R_166() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_5()) {
+    jj_scanpos = xsp;
+    if (jj_3R_170()) {
+    jj_scanpos = xsp;
+    if (jj_3R_171()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_45() {
-    if (jj_3R_60()) return true;
+  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;
     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_61()) { jj_scanpos = xsp; break; }
+      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_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;
     return false;
   }
 
-  static final private boolean jj_3R_99() {
-    if (jj_scan_token(LBRACE)) return true;
+  static final private boolean jj_3_3() {
+    if (jj_3R_42()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_41()) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_84() {
+    if (jj_scan_token(PRINT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(RBRACE)) return true;
+    if (jj_3R_45()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_71() {
-    if (jj_scan_token(IDENTIFIER)) return true;
+  static final private boolean jj_3R_56() {
+    if (jj_3R_86()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_109()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_166() {
-    if (jj_scan_token(FLOATING_POINT_LITERAL)) return true;
+  static final private boolean jj_3R_55() {
+    if (jj_3R_42()) 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(LBRACE)) return true;
+  static final private boolean jj_3R_194() {
+    if (jj_scan_token(DECR)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_41()) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_54() {
+    if (jj_3R_85()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(RBRACE)) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_193() {
+    if (jj_scan_token(INCR)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_62() {
+  static final private boolean jj_3R_185() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_70()) {
-    jj_scanpos = xsp;
-    if (jj_3R_71()) {
-    jj_scanpos = xsp;
-    if (jj_3R_72()) {
+    if (jj_3R_193()) {
     jj_scanpos = xsp;
-    if (jj_3R_73()) return true;
+    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;
-    } 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_162() {
+  static final private boolean jj_3R_45() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_165()) {
-    jj_scanpos = xsp;
-    if (jj_3R_166()) {
+    if (jj_3R_53()) {
     jj_scanpos = xsp;
-    if (jj_3R_167()) {
+    if (jj_3R_54()) {
     jj_scanpos = xsp;
-    if (jj_3R_168()) {
+    if (jj_3R_55()) {
     jj_scanpos = xsp;
-    if (jj_3R_169()) return true;
+    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;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_165() {
-    if (jj_scan_token(INTEGER_LITERAL)) return true;
+  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_111() {
-    if (jj_scan_token(XOR)) return true;
+  static final private boolean jj_3R_168() {
+    if (jj_3R_166()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_110()) return true;
+    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_83() {
+    if (jj_scan_token(OBJECT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_94() {
-    if (jj_scan_token(DOLLAR)) 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;
-    if (jj_3R_62()) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_184() {
+    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_63() {
-    if (jj_3R_41()) return true;
+  static final private boolean jj_3R_82() {
+    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_107() {
-    if (jj_3R_110()) return true;
+  static final private boolean jj_3R_183() {
+    if (jj_3R_52()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_111()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
     return false;
   }
 
-  static final private boolean jj_3R_93() {
-    if (jj_scan_token(DOLLAR_ID)) return true;
+  static final private boolean jj_3R_81() {
+    if (jj_scan_token(INT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_99()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_77() {
+  static final private boolean jj_3R_167() {
+    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_93()) {
+    if (jj_3R_183()) {
     jj_scanpos = xsp;
-    if (jj_3R_94()) 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;
+    if (jj_scan_token(RPAREN)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_139()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_47() {
-    if (jj_scan_token(LBRACKET)) return true;
+  static final private boolean jj_3R_80() {
+    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_43() {
+    if (jj_3R_52()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_79() {
+    if (jj_scan_token(DOUBLE)) 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;
+    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;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3_4() {
+    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_63()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(RBRACKET)) return true;
+    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_108() {
-    if (jj_scan_token(BIT_OR)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_107()) return true;
+  static final private boolean jj_3R_76() {
+    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_100() {
-    if (jj_3R_107()) return true;
+  static final private boolean jj_3R_75() {
+    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() {
     Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_108()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
+    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()) {
+    jj_scanpos = xsp;
+    if (jj_3R_80()) {
+    jj_scanpos = xsp;
+    if (jj_3R_81()) {
+    jj_scanpos = xsp;
+    if (jj_3R_82()) {
+    jj_scanpos = xsp;
+    if (jj_3R_83()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3_1() {
-    if (jj_3R_38()) return true;
+  static final private boolean jj_3R_165() {
+    if (jj_scan_token(LPAREN)) 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;
+    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_103() {
-    if (jj_scan_token(_ANDL)) return true;
+  static final private boolean jj_3R_164() {
+    if (jj_3R_169()) 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(CLASSACCESS)) return true;
+  static final private boolean jj_3R_163() {
+    if (jj_3R_168()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_62()) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_162() {
+    if (jj_3R_167()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_38() {
+  static final private boolean jj_3R_158() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_46()) {
+    if (jj_3R_161()) {
     jj_scanpos = xsp;
-    if (jj_3R_47()) return true;
+    if (jj_3R_162()) {
+    jj_scanpos = xsp;
+    if (jj_3R_163()) {
+    jj_scanpos = xsp;
+    if (jj_3R_164()) {
+    jj_scanpos = xsp;
+    if (jj_3R_165()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_68() {
-    if (jj_3R_77()) return true;
+  static final private boolean jj_3R_161() {
+    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_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3_1()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
     return false;
   }
 
-  static final private boolean jj_3R_101() {
-    if (jj_scan_token(DOT)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_100()) return true;
+  static final private boolean jj_3R_160() {
+    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_95() {
-    if (jj_3R_100()) return true;
+  static final private boolean jj_3R_159() {
+    if (jj_scan_token(INCR)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_157() {
     Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_101()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
+    xsp = jj_scanpos;
+    if (jj_3R_159()) {
+    jj_scanpos = xsp;
+    if (jj_3R_160()) 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_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_188() {
-    if (jj_3R_38()) return true;
+  static final private boolean jj_3R_152() {
+    if (jj_3R_158()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_44() {
-    if (jj_scan_token(IDENTIFIER)) return true;
+  static final private boolean jj_3R_151() {
+    if (jj_3R_157()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(COLON)) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_156() {
+    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_187() {
-    if (jj_3R_191()) return true;
+  static final private boolean jj_3R_155() {
+    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_183() {
+  static final private boolean jj_3R_148() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_187()) {
+    if (jj_3R_150()) {
     jj_scanpos = xsp;
-    if (jj_3R_188()) return true;
+    if (jj_3R_151()) {
+    jj_scanpos = xsp;
+    if (jj_3R_152()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_98() {
-    if (jj_scan_token(_ORL)) return true;
+  static final private boolean jj_3R_150() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_155()) {
+    jj_scanpos = xsp;
+    if (jj_3R_156()) 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_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_190() {
-    if (jj_3R_68()) return true;
+  static final private boolean jj_3R_154() {
+    if (jj_3R_148()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_102() {
-    if (jj_scan_token(SC_AND)) return true;
+  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_96() {
+  static final private boolean jj_3R_149() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_102()) {
+    if (jj_3R_153()) {
     jj_scanpos = xsp;
-    if (jj_3R_103()) 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;
-    if (jj_3R_95()) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_153() {
+    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_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_144() {
+    if (jj_3R_149()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_185() {
+  static final private boolean jj_3R_139() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_189()) {
+    if (jj_3R_143()) {
     jj_scanpos = xsp;
-    if (jj_3R_190()) return true;
+    if (jj_3R_144()) 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_78() {
-    if (jj_3R_95()) return true;
+  static final private boolean jj_3R_143() {
+    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_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_96()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
     return false;
   }
 
@@ -5625,7 +6813,7 @@ final int pos = jj_input_stream.getPosition();
   static public boolean lookingAhead = false;
   static private boolean jj_semLA;
   static private int jj_gen;
-  static final private int[] jj_la1 = new int[122];
+  static final private int[] jj_la1 = new int[125];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static private int[] jj_la1_2;
@@ -5639,21 +6827,21 @@ final int pos = jj_input_stream.getPosition();
       jj_la1_4();
    }
    private static void jj_la1_0() {
-      jj_la1_0 = new int[] {0xfcb0001e,0x0,0x6,0x6,0xfcb0001e,0xfcb00000,0x0,0x600000,0x600000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x0,0x14000000,0x0,0x0,0x0,0x0,0x0,0x0,0x14000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x0,0x4000000,0x0,0x4000000,0x0,0x0,0x0,0x0,0x4000000,0x0,0x4000000,0x0,0x0,0x14000000,0x0,0x0,0x0,0x14000000,0x0,0x10,0x0,0xe4800000,0xfc800000,0x10,0x10,0x10,0x10,0xc0000000,0x0,0x0,0x0,0x0,0x10,0x0,0x10,0x0,0x10,0xfcb00000,0xfcb00000,0xf4b00000,0x0,0x0,0x0,0x0,0x4000000,0x0,0xf4b00000,0x8000000,0x14000000,0x0,0xfc800000,0x1000000,0x2000000,0x1000000,0x2000000,0xfc800000,0xfc800000,0xfc800000,0xfc800000,0x10,0xfc800000,0x10,0x0,0x0,0x4000000,0x14000000,0x4000000,0xfc800000,0xfc800000,0x4000000,0x0,0x0,0x14000000,};
+      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,0x0,0x0,0x0,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,};
    }
    private static void jj_la1_1() {
-      jj_la1_1 = new int[] {0x11d7548f,0x0,0x0,0x0,0x11d7548f,0x11d7548f,0x2000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc20000,0x40,0xc30080,0x0,0x0,0x0,0x0,0xc0000000,0x0,0xc30080,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc30000,0x0,0xc30000,0x0,0xc30000,0x0,0x0,0x10,0x10,0x10000,0x10000,0x10000,0x0,0x10,0xc30080,0x10,0xc20000,0xc00000,0xc30080,0x0,0x0,0x0,0x1115540f,0x11d7548f,0x0,0x0,0x0,0x0,0x3,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x11d7548f,0x11d7548f,0x11d7548f,0x0,0x0,0x0,0x0,0x10000,0x900,0x11d7548f,0x0,0xc30080,0x900,0x11d7548f,0x0,0x0,0x0,0x0,0x11d7548f,0x11d7548f,0x11d7548f,0x11d7548f,0x0,0x11d7548f,0x0,0x10,0x40,0x10000,0xc30080,0x10000,0x11d7548f,0x11d7548f,0x10000,0x0,0x0,0xc30080,};
+      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,0x0,0x0,0x0,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,};
    }
    private static void jj_la1_2() {
-      jj_la1_2 = new int[] {0x2288a200,0x20000000,0x0,0x0,0x2288a200,0x2288a200,0x0,0x0,0x0,0x40000000,0x0,0x2000000,0x0,0x2000000,0x2080000,0x2200,0x2200,0x8a200,0x0,0x88a200,0x0,0x40000000,0x0,0x0,0x7f,0x0,0x88a200,0x0,0x0,0x80,0x80,0x100,0x100,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x88a200,0x0,0x88a200,0x0,0x88a200,0x0,0x0,0x8800000,0x8800000,0x80000,0x80000,0x80000,0x80000,0x8800000,0x88a200,0x8000000,0xa200,0x0,0x88a200,0x40000000,0x20000000,0x0,0x22080000,0x2288a200,0x20000000,0x20000000,0x20000000,0x20000000,0x0,0x0,0x40000000,0x0,0x40000000,0x20000000,0x40000000,0x20000000,0x40000000,0x20000000,0x2288a200,0x2288a200,0x2288a200,0x40000000,0x0,0x0,0x0,0x80000,0x0,0x2288a200,0x0,0x88a200,0x0,0x2288a200,0x0,0x0,0x0,0x0,0x2288a200,0x2288a200,0x2288a200,0x2288a200,0x20000000,0x2288a200,0x20000000,0x8000000,0x0,0x80000,0x88a200,0x80000,0x2288a200,0x2288a200,0x80000,0x40000000,0x80000,0x88a200,};
+      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,0x400200,0x0,0x400000,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,};
    }
    private static void jj_la1_3() {
-      jj_la1_3 = new int[] {0x78700000,0x0,0x0,0x0,0x78700000,0x78700000,0x0,0x0,0x0,0x0,0x200,0x0,0x200000,0x0,0x200000,0x0,0x0,0x60000000,0x0,0x78700000,0x0,0x0,0x200000,0x0,0x0,0xffe00,0x78700000,0xffe00,0x800000,0x2000000,0x2000000,0x4000000,0x4000000,0x0,0x0,0x0,0x0,0x1e4,0x1e4,0x1b,0x1b,0x0,0x0,0x60000000,0x60000000,0x80000000,0x80000000,0x100000,0x78700000,0x60000000,0x78600000,0x400000,0x200000,0x18000000,0x18000000,0x0,0x0,0x200000,0x200000,0x200000,0x200000,0x0,0x78700000,0x0,0x0,0x0,0x78700000,0x0,0x0,0x100000,0x18300000,0x78700000,0x0,0x0,0x0,0x0,0x0,0x200000,0x0,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x78700000,0x78700000,0x78700000,0x0,0x200,0x180ffe00,0x180ffe00,0x18200000,0x0,0x78700000,0x0,0x78700000,0x0,0x78700000,0x0,0x0,0x0,0x0,0x79700000,0x78700000,0x78700000,0x78700000,0x0,0x79700000,0x0,0x0,0x0,0x18200000,0x78700000,0x18200000,0x78700000,0x79700000,0x18200000,0x0,0x0,0x78700000,};
+      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,0x0,0x100000,0x0,0x80000000,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,};
    }
    private static void jj_la1_4() {
-      jj_la1_4 = new int[] {0x402,0x0,0x0,0x0,0x402,0x402,0x0,0x0,0x0,0x0,0x0,0x0,0x400,0x0,0x400,0x0,0x0,0x0,0x0,0x402,0x2,0x0,0x402,0x2,0x0,0x300,0x402,0x300,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x8,0x2,0x0,0x0,0x0,0x0,0xe0,0xe0,0x0,0x0,0x11,0x11,0x0,0x402,0x0,0x400,0x0,0x400,0x0,0x0,0x0,0x0,0x400,0x400,0x400,0x400,0x0,0x402,0x0,0x0,0x0,0x402,0x0,0x0,0x0,0x400,0x402,0x0,0x0,0x0,0x0,0x0,0x400,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x402,0x402,0x402,0x0,0x0,0x300,0x300,0x400,0x0,0x402,0x0,0x402,0x0,0x402,0x0,0x0,0x0,0x0,0x402,0x402,0x402,0x402,0x0,0x402,0x0,0x0,0x0,0x400,0x402,0x400,0x402,0x402,0x400,0x0,0x0,0x402,};
+      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,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,};
    }
-  static final private JJCalls[] jj_2_rtns = new JJCalls[7];
+  static final private JJCalls[] jj_2_rtns = new JJCalls[8];
   static private boolean jj_rescan = false;
   static private int jj_gc = 0;
 
@@ -5670,7 +6858,7 @@ final int pos = jj_input_stream.getPosition();
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 122; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 125; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -5680,7 +6868,7 @@ final int pos = jj_input_stream.getPosition();
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 122; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 125; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -5697,7 +6885,7 @@ final int pos = jj_input_stream.getPosition();
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 122; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 125; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -5707,7 +6895,7 @@ final int pos = jj_input_stream.getPosition();
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 122; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 125; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -5723,7 +6911,7 @@ final int pos = jj_input_stream.getPosition();
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 122; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 125; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -5732,7 +6920,7 @@ final int pos = jj_input_stream.getPosition();
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 122; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 125; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -5839,15 +7027,15 @@ final int pos = jj_input_stream.getPosition();
 
   static public ParseException generateParseException() {
     jj_expentries.removeAllElements();
-    boolean[] la1tokens = new boolean[139];
-    for (int i = 0; i < 139; i++) {
+    boolean[] la1tokens = new boolean[141];
+    for (int i = 0; i < 141; i++) {
       la1tokens[i] = false;
     }
     if (jj_kind >= 0) {
       la1tokens[jj_kind] = true;
       jj_kind = -1;
     }
-    for (int i = 0; i < 122; i++) {
+    for (int i = 0; i < 125; i++) {
       if (jj_la1[i] == jj_gen) {
         for (int j = 0; j < 32; j++) {
           if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -5868,7 +7056,7 @@ final int pos = jj_input_stream.getPosition();
         }
       }
     }
-    for (int i = 0; i < 139; i++) {
+    for (int i = 0; i < 141; i++) {
       if (la1tokens[i]) {
         jj_expentry = new int[1];
         jj_expentry[0] = i;
@@ -5893,7 +7081,7 @@ final int pos = jj_input_stream.getPosition();
 
   static final private void jj_rescan_token() {
     jj_rescan = true;
-    for (int i = 0; i < 7; i++) {
+    for (int i = 0; i < 8; i++) {
       JJCalls p = jj_2_rtns[i];
       do {
         if (p.gen > jj_gen) {
@@ -5906,6 +7094,7 @@ final int pos = jj_input_stream.getPosition();
             case 4: jj_3_5(); break;
             case 5: jj_3_6(); break;
             case 6: jj_3_7(); break;
+            case 7: jj_3_8(); break;
           }
         }
         p = p.next;