Modified parser to return the parsed string (now I have the parameter list of functio...

diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.java b/net.sourceforge.phpeclipse/src/test/PHPParser.java
index 52c4d3d..0a1f400 100644 (file)
--- a/net.sourceforge.phpeclipse/src/test/PHPParser.java
+++ b/net.sourceforge.phpeclipse/src/test/PHPParser.java
@@ -385,21 +385,30 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
     jj_consume_token(SEMICOLON);
   }
 
-  static final public void VariableDeclarator() throws ParseException {
-    VariableDeclaratorId();
+  static final public String VariableDeclarator() throws ParseException {
+  String expr;
+  StringBuffer buff = new StringBuffer();
+    expr = VariableDeclaratorId();
+   buff.append(expr);
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case ASSIGN:
       jj_consume_token(ASSIGN);
-      VariableInitializer();
+      expr = VariableInitializer();
+     buff.append("=").append(expr);
       break;
     default:
       jj_la1[6] = jj_gen;
       ;
     }
+   {if (true) return buff.toString();}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void VariableDeclaratorId() throws ParseException {
-    Variable();
+  static final public String VariableDeclaratorId() throws ParseException {
+  String expr;
+  StringBuffer buff = new StringBuffer();
+    expr = Variable();
+   buff.append(expr);
     label_5:
     while (true) {
       if (jj_2_1(2)) {
@@ -407,97 +416,116 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
       } else {
         break label_5;
       }
-      VariableSuffix();
+      expr = VariableSuffix();
+   buff.append(expr);
     }
+   {if (true) return buff.toString();}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void Variable() throws ParseException {
+  static final public String Variable() throws ParseException {
+  String expr = null;
+  Token token;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case DOLLAR_ID:
-      jj_consume_token(DOLLAR_ID);
-      label_6:
-      while (true) {
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-        case LBRACE:
-          ;
-          break;
-        default:
-          jj_la1[7] = jj_gen;
-          break label_6;
-        }
+      token = jj_consume_token(DOLLAR_ID);
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case LBRACE:
         jj_consume_token(LBRACE);
-        Expression();
+        expr = Expression();
         jj_consume_token(RBRACE);
+        break;
+      default:
+        jj_la1[7] = jj_gen;
+        ;
       }
+    if (expr == null) {
+      {if (true) return token.image;}
+    }
+    {if (true) return token + "{" + expr + "}";}
       break;
     case DOLLAR:
       jj_consume_token(DOLLAR);
-      VariableName();
+      expr = VariableName();
+   {if (true) return "$" + expr;}
       break;
     default:
       jj_la1[8] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
+    throw new Error("Missing return statement in function");
   }
 
   static final public String VariableName() throws ParseException {
+String expr = null;
+Token token;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case LBRACE:
       jj_consume_token(LBRACE);
-      Expression();
+      expr = Expression();
       jj_consume_token(RBRACE);
+   {if (true) return "{"+expr+"}";}
       break;
     case IDENTIFIER:
-      jj_consume_token(IDENTIFIER);
-      label_7:
-      while (true) {
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-        case LBRACE:
-          ;
-          break;
-        default:
-          jj_la1[9] = jj_gen;
-          break label_7;
-        }
+      token = jj_consume_token(IDENTIFIER);
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case LBRACE:
         jj_consume_token(LBRACE);
-        Expression();
+        expr = Expression();
         jj_consume_token(RBRACE);
+        break;
+      default:
+        jj_la1[9] = jj_gen;
+        ;
       }
+    if (expr == null) {
+      {if (true) return token.image;}
+    }
+    {if (true) return token + "{" + expr + "}";}
       break;
     case DOLLAR:
       jj_consume_token(DOLLAR);
-      VariableName();
+      expr = VariableName();
+   {if (true) return "$" + expr;}
       break;
     default:
       jj_la1[10] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void VariableInitializer() throws ParseException {
-    Expression();
+  static final public String VariableInitializer() throws ParseException {
+  String expr;
+    expr = Expression();
+   {if (true) return expr;}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void ArrayVariable() throws ParseException {
-    Expression();
-    label_8:
-    while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case ARRAYASSIGN:
-        ;
-        break;
-      default:
-        jj_la1[11] = jj_gen;
-        break label_8;
-      }
+  static final public String ArrayVariable() throws ParseException {
+String expr;
+StringBuffer buff = new StringBuffer();
+    expr = Expression();
+   buff.append(expr);
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case ARRAYASSIGN:
       jj_consume_token(ARRAYASSIGN);
-      Expression();
+      expr = Expression();
+    buff.append("=>").append(expr);
+      break;
+    default:
+      jj_la1[11] = jj_gen;
+      ;
     }
+   {if (true) return buff.toString();}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void ArrayInitializer() throws ParseException {
+  static final public String ArrayInitializer() throws ParseException {
+String expr = null;
+StringBuffer buff = new StringBuffer("(");
     jj_consume_token(LPAREN);
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case ARRAY:
@@ -520,16 +548,18 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
     case MINUS:
     case BIT_AND:
     case DOLLAR_ID:
-      ArrayVariable();
-      label_9:
+      expr = ArrayVariable();
+             buff.append(expr);
+      label_6:
       while (true) {
         if (jj_2_2(2)) {
           ;
         } else {
-          break label_9;
+          break label_6;
         }
         jj_consume_token(COMMA);
-        ArrayVariable();
+        expr = ArrayVariable();
+             buff.append(",").append(expr);
       }
       break;
     default:
@@ -537,6 +567,9 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
       ;
     }
     jj_consume_token(RPAREN);
+    buff.append(")");
+    {if (true) return buff.toString();}
+    throw new Error("Missing return statement in function");
   }
 
   static final public void MethodDeclaration() throws ParseException {
@@ -561,37 +594,37 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
   }
 
   static final public PHPFunctionDeclaration MethodDeclarator() throws ParseException {
-  Token bit_and = null;
   Token identifier;
   StringBuffer methodDeclaration = new StringBuffer();
   String formalParameters;
   int pos = jj_input_stream.bufpos;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case BIT_AND:
-      bit_and = jj_consume_token(BIT_AND);
+      jj_consume_token(BIT_AND);
+               methodDeclaration.append("&");
       break;
     default:
       jj_la1[14] = jj_gen;
       ;
     }
     identifier = jj_consume_token(IDENTIFIER);
-    FormalParameters();
-    if (bit_and != null) {
-      methodDeclaration.append("&");
-    }
-    methodDeclaration.append(identifier);
+    formalParameters = FormalParameters();
+    methodDeclaration.append(identifier).append(formalParameters);
     {if (true) return new PHPFunctionDeclaration(currentSegment,methodDeclaration.toString(),pos);}
     throw new Error("Missing return statement in function");
   }
 
-  static final public void FormalParameters() throws ParseException {
+  static final public String FormalParameters() throws ParseException {
+  String expr;
+  StringBuffer buff = new StringBuffer("(");
     jj_consume_token(LPAREN);
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case DOLLAR:
     case BIT_AND:
     case DOLLAR_ID:
-      FormalParameter();
-      label_10:
+      expr = FormalParameter();
+                                       buff.append(expr);
+      label_7:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case COMMA:
@@ -599,10 +632,11 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
           break;
         default:
           jj_la1[15] = jj_gen;
-          break label_10;
+          break label_7;
         }
         jj_consume_token(COMMA);
-        FormalParameter();
+        expr = FormalParameter();
+             buff.append(",").append(expr);
       }
       break;
     default:
@@ -610,57 +644,79 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
       ;
     }
     jj_consume_token(RPAREN);
+  buff.append(")");
+  {if (true) return buff.toString();}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void FormalParameter() throws ParseException {
+  static final public String FormalParameter() throws ParseException {
+  String expr;
+  StringBuffer buff = new StringBuffer();
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case BIT_AND:
       jj_consume_token(BIT_AND);
+              buff.append("&");
       break;
     default:
       jj_la1[17] = jj_gen;
       ;
     }
-    VariableDeclarator();
+    expr = VariableDeclarator();
+    buff.append(expr);
+    {if (true) return buff.toString();}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void Type() throws ParseException {
+  static final public String Type() throws ParseException {
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case STRING:
       jj_consume_token(STRING);
+   {if (true) return "string";}
       break;
     case BOOL:
       jj_consume_token(BOOL);
+   {if (true) return "bool";}
       break;
     case BOOLEAN:
       jj_consume_token(BOOLEAN);
+   {if (true) return "boolean";}
       break;
     case REAL:
       jj_consume_token(REAL);
+   {if (true) return "real";}
       break;
     case DOUBLE:
       jj_consume_token(DOUBLE);
+   {if (true) return "double";}
       break;
     case FLOAT:
       jj_consume_token(FLOAT);
+   {if (true) return "float";}
       break;
     case INT:
       jj_consume_token(INT);
+   {if (true) return "int";}
       break;
     case INTEGER:
       jj_consume_token(INTEGER);
+   {if (true) return "integer";}
       break;
     default:
       jj_la1[18] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void Expression() throws ParseException {
+  static final public String Expression() throws ParseException {
+  String expr;
+  String assignOperator = null;
+  String expr2 = null;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case PRINT:
-      PrintExpression();
+      expr = PrintExpression();
+   {if (true) return expr;}
       break;
     case ARRAY:
     case FALSE:
@@ -681,7 +737,7 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
     case MINUS:
     case BIT_AND:
     case DOLLAR_ID:
-      ConditionalExpression();
+      expr = ConditionalExpression();
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case ASSIGN:
       case PLUSASSIGN:
@@ -696,87 +752,122 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
       case LSHIFTASSIGN:
       case RSIGNEDSHIFTASSIGN:
       case RUNSIGNEDSHIFTASSIGN:
-        AssignmentOperator();
-        Expression();
+        assignOperator = AssignmentOperator();
+        expr2 = Expression();
         break;
       default:
         jj_la1[19] = jj_gen;
         ;
       }
+    if (expr2 == null) {
+      {if (true) return expr;}
+    } else {
+      {if (true) return expr + assignOperator + expr2;}
+    }
       break;
     default:
       jj_la1[20] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void AssignmentOperator() throws ParseException {
+  static final public String AssignmentOperator() throws ParseException {
+  Token assignOperator;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case ASSIGN:
       jj_consume_token(ASSIGN);
+ {if (true) return "=";}
       break;
     case STARASSIGN:
       jj_consume_token(STARASSIGN);
+ {if (true) return "*=";}
       break;
     case SLASHASSIGN:
       jj_consume_token(SLASHASSIGN);
+ {if (true) return "/=";}
       break;
     case REMASSIGN:
       jj_consume_token(REMASSIGN);
+ {if (true) return "%=";}
       break;
     case PLUSASSIGN:
       jj_consume_token(PLUSASSIGN);
+ {if (true) return "+=";}
       break;
     case MINUSASSIGN:
       jj_consume_token(MINUSASSIGN);
+ {if (true) return "-=";}
       break;
     case LSHIFTASSIGN:
       jj_consume_token(LSHIFTASSIGN);
+ {if (true) return "<<=";}
       break;
     case RSIGNEDSHIFTASSIGN:
       jj_consume_token(RSIGNEDSHIFTASSIGN);
+ {if (true) return ">>=";}
       break;
     case RUNSIGNEDSHIFTASSIGN:
       jj_consume_token(RUNSIGNEDSHIFTASSIGN);
+ {if (true) return ">>>=";}
       break;
     case ANDASSIGN:
       jj_consume_token(ANDASSIGN);
+ {if (true) return "&=";}
       break;
     case XORASSIGN:
       jj_consume_token(XORASSIGN);
+ {if (true) return "|=";}
       break;
     case ORASSIGN:
       jj_consume_token(ORASSIGN);
+ {if (true) return "|=";}
       break;
     case DOTASSIGN:
       jj_consume_token(DOTASSIGN);
+ {if (true) return ".=";}
       break;
     default:
       jj_la1[21] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void ConditionalExpression() throws ParseException {
-    ConditionalOrExpression();
+  static final public String ConditionalExpression() throws ParseException {
+  String expr;
+  String expr2 = null;
+  String expr3 = null;
+    expr = ConditionalOrExpression();
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case HOOK:
       jj_consume_token(HOOK);
-      Expression();
+      expr2 = Expression();
       jj_consume_token(COLON);
-      ConditionalExpression();
+      expr3 = ConditionalExpression();
       break;
     default:
       jj_la1[22] = jj_gen;
       ;
     }
+  if (expr3 == null) {
+    {if (true) return expr;}
+  } else {
+    {if (true) return expr + "?" + expr2 + ":" + expr3;}
+  }
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void ConditionalOrExpression() throws ParseException {
-    ConditionalAndExpression();
-    label_11:
+  static final public String ConditionalOrExpression() throws ParseException {
+  String expr;
+  Token operator;
+  String expr2 = null;
+  StringBuffer buff = new StringBuffer();
+    expr = ConditionalAndExpression();
+    buff.append(expr);
+    label_8:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case _ORL:
@@ -785,27 +876,36 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
         break;
       default:
         jj_la1[23] = jj_gen;
-        break label_11;
+        break label_8;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case SC_OR:
-        jj_consume_token(SC_OR);
+        operator = jj_consume_token(SC_OR);
         break;
       case _ORL:
-        jj_consume_token(_ORL);
+        operator = jj_consume_token(_ORL);
         break;
       default:
         jj_la1[24] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
-      ConditionalAndExpression();
+      expr2 = ConditionalAndExpression();
+      buff.append(operator.image);
+      buff.append(expr2);
     }
+    {if (true) return buff.toString();}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void ConditionalAndExpression() throws ParseException {
-    ConcatExpression();
-    label_12:
+  static final public String ConditionalAndExpression() throws ParseException {
+  String expr;
+  Token operator;
+  String expr2 = null;
+  StringBuffer buff = new StringBuffer();
+    expr = ConcatExpression();
+    buff.append(expr);
+    label_9:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case _ANDL:
@@ -814,27 +914,35 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
         break;
       default:
         jj_la1[25] = jj_gen;
-        break label_12;
+        break label_9;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case SC_AND:
-        jj_consume_token(SC_AND);
+        operator = jj_consume_token(SC_AND);
         break;
       case _ANDL:
-        jj_consume_token(_ANDL);
+        operator = jj_consume_token(_ANDL);
         break;
       default:
         jj_la1[26] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
-      ConcatExpression();
+      expr2 = ConcatExpression();
+      buff.append(operator.image);
+      buff.append(expr2);
     }
+    {if (true) return buff.toString();}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void ConcatExpression() throws ParseException {
-    InclusiveOrExpression();
-    label_13:
+  static final public String ConcatExpression() throws ParseException {
+  String expr;
+  String expr2 = null;
+  StringBuffer buff = new StringBuffer();
+    expr = InclusiveOrExpression();
+    buff.append(expr);
+    label_10:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case DOT:
@@ -842,16 +950,24 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
         break;
       default:
         jj_la1[27] = jj_gen;
-        break label_13;
+        break label_10;
       }
       jj_consume_token(DOT);
-      InclusiveOrExpression();
+      expr2 = InclusiveOrExpression();
+    buff.append(".");
+    buff.append(expr2);
     }
+    {if (true) return buff.toString();}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void InclusiveOrExpression() throws ParseException {
-    ExclusiveOrExpression();
-    label_14:
+  static final public String InclusiveOrExpression() throws ParseException {
+  String expr;
+  String expr2 = null;
+  StringBuffer buff = new StringBuffer();
+    expr = ExclusiveOrExpression();
+    buff.append(expr);
+    label_11:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case BIT_OR:
@@ -859,16 +975,24 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
         break;
       default:
         jj_la1[28] = jj_gen;
-        break label_14;
+        break label_11;
       }
       jj_consume_token(BIT_OR);
-      ExclusiveOrExpression();
+      expr2 = ExclusiveOrExpression();
+    buff.append("|");
+    buff.append(expr2);
     }
+    {if (true) return buff.toString();}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void ExclusiveOrExpression() throws ParseException {
-    AndExpression();
-    label_15:
+  static final public String ExclusiveOrExpression() throws ParseException {
+  String expr;
+  String expr2 = null;
+  StringBuffer buff = new StringBuffer();
+    expr = AndExpression();
+    buff.append(expr);
+    label_12:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case XOR:
@@ -876,16 +1000,24 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
         break;
       default:
         jj_la1[29] = jj_gen;
-        break label_15;
+        break label_12;
       }
       jj_consume_token(XOR);
-      AndExpression();
+      expr2 = AndExpression();
+    buff.append("^");
+    buff.append(expr2);
     }
+    {if (true) return buff.toString();}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void AndExpression() throws ParseException {
-    EqualityExpression();
-    label_16:
+  static final public String AndExpression() throws ParseException {
+  String expr;
+  String expr2 = null;
+  StringBuffer buff = new StringBuffer();
+    expr = EqualityExpression();
+    buff.append(expr);
+    label_13:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case BIT_AND:
@@ -893,16 +1025,25 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
         break;
       default:
         jj_la1[30] = jj_gen;
-        break label_16;
+        break label_13;
       }
       jj_consume_token(BIT_AND);
-      EqualityExpression();
+      expr2 = EqualityExpression();
+    buff.append("&");
+    buff.append(expr2);
     }
+    {if (true) return buff.toString();}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void EqualityExpression() throws ParseException {
-    RelationalExpression();
-    label_17:
+  static final public String EqualityExpression() throws ParseException {
+  String expr;
+  Token operator;
+  String expr2;
+  StringBuffer buff = new StringBuffer();
+    expr = RelationalExpression();
+   buff.append(expr);
+    label_14:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case EQ:
@@ -911,27 +1052,36 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
         break;
       default:
         jj_la1[31] = jj_gen;
-        break label_17;
+        break label_14;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case EQ:
-        jj_consume_token(EQ);
+        operator = jj_consume_token(EQ);
         break;
       case NE:
-        jj_consume_token(NE);
+        operator = jj_consume_token(NE);
         break;
       default:
         jj_la1[32] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
-      RelationalExpression();
+      expr2 = RelationalExpression();
+    buff.append(operator.image);
+    buff.append(expr2);
     }
+   {if (true) return buff.toString();}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void RelationalExpression() throws ParseException {
-    ShiftExpression();
-    label_18:
+  static final public String RelationalExpression() throws ParseException {
+  String expr;
+  Token operator;
+  String expr2;
+  StringBuffer buff = new StringBuffer();
+    expr = ShiftExpression();
+   buff.append(expr);
+    label_15:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case GT:
@@ -942,33 +1092,42 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
         break;
       default:
         jj_la1[33] = jj_gen;
-        break label_18;
+        break label_15;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case LT:
-        jj_consume_token(LT);
+        operator = jj_consume_token(LT);
         break;
       case GT:
-        jj_consume_token(GT);
+        operator = jj_consume_token(GT);
         break;
       case LE:
-        jj_consume_token(LE);
+        operator = jj_consume_token(LE);
         break;
       case GE:
-        jj_consume_token(GE);
+        operator = jj_consume_token(GE);
         break;
       default:
         jj_la1[34] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
-      ShiftExpression();
+      expr2 = ShiftExpression();
+    buff.append(operator.image);
+    buff.append(expr2);
     }
+   {if (true) return buff.toString();}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void ShiftExpression() throws ParseException {
-    AdditiveExpression();
-    label_19:
+  static final public String ShiftExpression() throws ParseException {
+  String expr;
+  Token operator;
+  String expr2;
+  StringBuffer buff = new StringBuffer();
+    expr = AdditiveExpression();
+   buff.append(expr);
+    label_16:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case LSHIFT:
@@ -978,30 +1137,39 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
         break;
       default:
         jj_la1[35] = jj_gen;
-        break label_19;
+        break label_16;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case LSHIFT:
-        jj_consume_token(LSHIFT);
+        operator = jj_consume_token(LSHIFT);
         break;
       case RSIGNEDSHIFT:
-        jj_consume_token(RSIGNEDSHIFT);
+        operator = jj_consume_token(RSIGNEDSHIFT);
         break;
       case RUNSIGNEDSHIFT:
-        jj_consume_token(RUNSIGNEDSHIFT);
+        operator = jj_consume_token(RUNSIGNEDSHIFT);
         break;
       default:
         jj_la1[36] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
-      AdditiveExpression();
+      expr2 = AdditiveExpression();
+    buff.append(operator.image);
+    buff.append(expr2);
     }
+   {if (true) return buff.toString();}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void AdditiveExpression() throws ParseException {
-    MultiplicativeExpression();
-    label_20:
+  static final public String AdditiveExpression() throws ParseException {
+  String expr;
+  Token operator;
+  String expr2;
+  StringBuffer buff = new StringBuffer();
+    expr = MultiplicativeExpression();
+   buff.append(expr);
+    label_17:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case PLUS:
@@ -1010,27 +1178,36 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
         break;
       default:
         jj_la1[37] = jj_gen;
-        break label_20;
+        break label_17;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case PLUS:
-        jj_consume_token(PLUS);
+        operator = jj_consume_token(PLUS);
         break;
       case MINUS:
-        jj_consume_token(MINUS);
+        operator = jj_consume_token(MINUS);
         break;
       default:
         jj_la1[38] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
-      MultiplicativeExpression();
+      expr2 = MultiplicativeExpression();
+    buff.append(operator.image);
+    buff.append(expr2);
     }
+   {if (true) return buff.toString();}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void MultiplicativeExpression() throws ParseException {
-    UnaryExpression();
-    label_21:
+  static final public String MultiplicativeExpression() throws ParseException {
+  String expr;
+  Token operator;
+  String expr2;
+  StringBuffer buff = new StringBuffer();
+    expr = UnaryExpression();
+   buff.append(expr);
+    label_18:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case STAR:
@@ -1040,54 +1217,67 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
         break;
       default:
         jj_la1[39] = jj_gen;
-        break label_21;
+        break label_18;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case STAR:
-        jj_consume_token(STAR);
+        operator = jj_consume_token(STAR);
         break;
       case SLASH:
-        jj_consume_token(SLASH);
+        operator = jj_consume_token(SLASH);
         break;
       case REM:
-        jj_consume_token(REM);
+        operator = jj_consume_token(REM);
         break;
       default:
         jj_la1[40] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
-      UnaryExpression();
+      expr2 = UnaryExpression();
+    buff.append(operator.image);
+    buff.append(expr2);
     }
+   {if (true) return buff.toString();}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void UnaryExpression() throws ParseException {
+  static final public String UnaryExpression() throws ParseException {
+  String expr;
+  StringBuffer buff = new StringBuffer();
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case AT:
       jj_consume_token(AT);
-      UnaryExpression();
+      expr = UnaryExpression();
+   {if (true) return "@" + expr;}
       break;
     case PLUS:
     case MINUS:
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case PLUS:
         jj_consume_token(PLUS);
+            buff.append("+");
         break;
       case MINUS:
         jj_consume_token(MINUS);
+                                         buff.append("-");
         break;
       default:
         jj_la1[41] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
-      UnaryExpression();
+      expr = UnaryExpression();
+    buff.append(expr);
+    {if (true) return buff.toString();}
       break;
     case INCR:
-      PreIncrementExpression();
+      expr = PreIncrementExpression();
+   {if (true) return expr;}
       break;
     case DECR:
-      PreDecrementExpression();
+      expr = PreDecrementExpression();
+   {if (true) return expr;}
       break;
     case ARRAY:
     case FALSE:
@@ -1103,35 +1293,46 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
     case BANG:
     case BIT_AND:
     case DOLLAR_ID:
-      UnaryExpressionNotPlusMinus();
+      expr = UnaryExpressionNotPlusMinus();
+   {if (true) return buff.toString();}
       break;
     default:
       jj_la1[42] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void PreIncrementExpression() throws ParseException {
+  static final public String PreIncrementExpression() throws ParseException {
+String expr;
     jj_consume_token(INCR);
-    PrimaryExpression();
+    expr = PrimaryExpression();
+   {if (true) return "++"+expr;}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void PreDecrementExpression() throws ParseException {
+  static final public String PreDecrementExpression() throws ParseException {
+String expr;
     jj_consume_token(DECR);
-    PrimaryExpression();
+    expr = PrimaryExpression();
+   {if (true) return "--"+expr;}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void UnaryExpressionNotPlusMinus() throws ParseException {
+  static final public String UnaryExpressionNotPlusMinus() throws ParseException {
+  String expr;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case BANG:
       jj_consume_token(BANG);
-      UnaryExpression();
+      expr = UnaryExpression();
+   {if (true) return "!" + expr;}
       break;
     default:
       jj_la1[43] = jj_gen;
       if (jj_2_3(2147483647)) {
-        CastExpression();
+        expr = CastExpression();
+   {if (true) return expr;}
       } else {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case ARRAY:
@@ -1140,7 +1341,8 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
         case DOLLAR:
         case BIT_AND:
         case DOLLAR_ID:
-          PostfixExpression();
+          expr = PostfixExpression();
+   {if (true) return expr;}
           break;
         case FALSE:
         case NULL:
@@ -1148,12 +1350,14 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
         case INTEGER_LITERAL:
         case FLOATING_POINT_LITERAL:
         case STRING_LITERAL:
-          Literal();
+          expr = Literal();
+   {if (true) return expr;}
           break;
         case LPAREN:
           jj_consume_token(LPAREN);
-          Expression();
+          expr = Expression();
           jj_consume_token(RPAREN);
+   {if (true) return "("+expr+")";}
           break;
         default:
           jj_la1[44] = jj_gen;
@@ -1162,26 +1366,33 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
         }
       }
     }
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void CastExpression() throws ParseException {
+  static final public String CastExpression() throws ParseException {
+String type;
+String expr;
     jj_consume_token(LPAREN);
-    Type();
+    type = Type();
     jj_consume_token(RPAREN);
-    UnaryExpression();
+    expr = UnaryExpression();
+   {if (true) return "(" + type + ")" + expr;}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void PostfixExpression() throws ParseException {
-    PrimaryExpression();
+  static final public String PostfixExpression() throws ParseException {
+  String expr;
+  Token operator = null;
+    expr = PrimaryExpression();
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case INCR:
     case DECR:
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case INCR:
-        jj_consume_token(INCR);
+        operator = jj_consume_token(INCR);
         break;
       case DECR:
-        jj_consume_token(DECR);
+        operator = jj_consume_token(DECR);
         break;
       default:
         jj_la1[45] = jj_gen;
@@ -1193,14 +1404,23 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
       jj_la1[46] = jj_gen;
       ;
     }
+    if (operator == null) {
+      {if (true) return expr;}
+    }
+    {if (true) return expr + operator.image;}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void PrimaryExpression() throws ParseException {
+  static final public String PrimaryExpression() throws ParseException {
+  Token identifier;
+  String expr;
+  StringBuffer buff = new StringBuffer();
     if (jj_2_4(2)) {
-      jj_consume_token(IDENTIFIER);
+      identifier = jj_consume_token(IDENTIFIER);
       jj_consume_token(STATICCLASSACCESS);
-      ClassIdentifier();
-      label_22:
+      expr = ClassIdentifier();
+   buff.append(identifier.image).append("::").append(expr);
+      label_19:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case CLASSACCESS:
@@ -1210,10 +1430,12 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
           break;
         default:
           jj_la1[47] = jj_gen;
-          break label_22;
+          break label_19;
         }
-        PrimarySuffix();
+        expr = PrimarySuffix();
+   buff.append(expr);
       }
+   {if (true) return buff.toString();}
     } else {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case NEW:
@@ -1221,8 +1443,9 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
       case DOLLAR:
       case BIT_AND:
       case DOLLAR_ID:
-        PrimaryPrefix();
-        label_23:
+        expr = PrimaryPrefix();
+   buff.append(expr);
+        label_20:
         while (true) {
           switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
           case CLASSACCESS:
@@ -1232,14 +1455,17 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
             break;
           default:
             jj_la1[48] = jj_gen;
-            break label_23;
+            break label_20;
           }
-          PrimarySuffix();
+          expr = PrimarySuffix();
+   buff.append(expr);
         }
+   {if (true) return buff.toString();}
         break;
       case ARRAY:
         jj_consume_token(ARRAY);
-        ArrayInitializer();
+        expr = ArrayInitializer();
+   {if (true) return "array" + expr;}
         break;
       default:
         jj_la1[49] = jj_gen;
@@ -1247,74 +1473,95 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
         throw new ParseException();
       }
     }
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void PrimaryPrefix() throws ParseException {
+  static final public String PrimaryPrefix() throws ParseException {
+  String expr;
+  Token token = null;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case IDENTIFIER:
-      jj_consume_token(IDENTIFIER);
+      token = jj_consume_token(IDENTIFIER);
+   {if (true) return token.image;}
       break;
     case NEW:
     case BIT_AND:
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case BIT_AND:
-        jj_consume_token(BIT_AND);
+        token = jj_consume_token(BIT_AND);
         break;
       default:
         jj_la1[50] = jj_gen;
         ;
       }
       jj_consume_token(NEW);
-      ClassIdentifier();
+      expr = ClassIdentifier();
+    if (token == null) {
+      {if (true) return "new " + expr;}
+    }
+    {if (true) return "new " + expr;}
       break;
     case DOLLAR:
     case DOLLAR_ID:
-      VariableDeclaratorId();
+      expr = VariableDeclaratorId();
+   {if (true) return expr;}
       break;
     default:
       jj_la1[51] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void ClassIdentifier() throws ParseException {
+  static final public String ClassIdentifier() throws ParseException {
+  String expr;
+  Token token;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case IDENTIFIER:
-      jj_consume_token(IDENTIFIER);
+      token = jj_consume_token(IDENTIFIER);
+   {if (true) return token.image;}
       break;
     case DOLLAR:
     case DOLLAR_ID:
-      VariableDeclaratorId();
+      expr = VariableDeclaratorId();
+   {if (true) return expr;}
       break;
     default:
       jj_la1[52] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void PrimarySuffix() throws ParseException {
+  static final public String PrimarySuffix() throws ParseException {
+  String expr;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case LPAREN:
-      Arguments();
+      expr = Arguments();
+   {if (true) return expr;}
       break;
     case CLASSACCESS:
     case LBRACKET:
-      VariableSuffix();
+      expr = VariableSuffix();
+   {if (true) return expr;}
       break;
     default:
       jj_la1[53] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void VariableSuffix() throws ParseException {
+  static final public String VariableSuffix() throws ParseException {
+  String expr = null;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case CLASSACCESS:
       jj_consume_token(CLASSACCESS);
-      VariableName();
+      expr = VariableName();
+   {if (true) return "->" + expr;}
       break;
     case LBRACKET:
       jj_consume_token(LBRACKET);
@@ -1339,32 +1586,42 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
       case MINUS:
       case BIT_AND:
       case DOLLAR_ID:
-        Expression();
+        expr = Expression();
         break;
       default:
         jj_la1[54] = jj_gen;
         ;
       }
       jj_consume_token(RBRACKET);
+    if(expr == null) {
+      {if (true) return "[]";}
+    }
+    {if (true) return "[" + expr + "]";}
       break;
     default:
       jj_la1[55] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void Literal() throws ParseException {
+  static final public String Literal() throws ParseException {
+  String expr;
+  Token token;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case INTEGER_LITERAL:
-      jj_consume_token(INTEGER_LITERAL);
+      token = jj_consume_token(INTEGER_LITERAL);
+   {if (true) return token.image;}
       break;
     case FLOATING_POINT_LITERAL:
-      jj_consume_token(FLOATING_POINT_LITERAL);
+      token = jj_consume_token(FLOATING_POINT_LITERAL);
+   {if (true) return token.image;}
       break;
     case STRING_LITERAL:
       try {
-        jj_consume_token(STRING_LITERAL);
+        token = jj_consume_token(STRING_LITERAL);
+   {if (true) return token.image;}
       } catch (TokenMgrError e) {
     errorMessage = "unterminated string";
     errorLevel   = ERROR;
@@ -1373,38 +1630,47 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
       break;
     case FALSE:
     case TRUE:
-      BooleanLiteral();
+      expr = BooleanLiteral();
+   {if (true) return expr;}
       break;
     case NULL:
-      NullLiteral();
+      expr = NullLiteral();
+   {if (true) return expr;}
       break;
     default:
       jj_la1[56] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void BooleanLiteral() throws ParseException {
+  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";}
       break;
     case FALSE:
       jj_consume_token(FALSE);
+   {if (true) return "false";}
       break;
     default:
       jj_la1[57] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void NullLiteral() throws ParseException {
+  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 void Arguments() throws ParseException {
+  static final public String Arguments() throws ParseException {
+String expr = null;
     jj_consume_token(LPAREN);
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case ARRAY:
@@ -1427,7 +1693,7 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
     case MINUS:
     case BIT_AND:
     case DOLLAR_ID:
-      ArgumentList();
+      expr = ArgumentList();
       break;
     default:
       jj_la1[58] = jj_gen;
@@ -1440,11 +1706,19 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
     errorLevel   = ERROR;
     {if (true) throw e;}
     }
+  if (expr == null) {
+    {if (true) return "()";}
+  }
+  {if (true) return "(" + expr + ")";}
+    throw new Error("Missing return statement in function");
   }
 
-  static final public void ArgumentList() throws ParseException {
-    Expression();
-    label_24:
+  static final public String ArgumentList() throws ParseException {
+String expr;
+StringBuffer buff = new StringBuffer();
+    expr = Expression();
+   buff.append(expr);
+    label_21:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case COMMA:
@@ -1452,17 +1726,20 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
         break;
       default:
         jj_la1[59] = jj_gen;
-        break label_24;
+        break label_21;
       }
       jj_consume_token(COMMA);
       try {
-        Expression();
+        expr = Expression();
       } catch (ParseException e) {
         errorMessage = "expression expected after a comma in argument list";
         errorLevel   = ERROR;
         {if (true) throw e;}
       }
+      buff.append(",").append("expr");
     }
+    {if (true) return buff.toString();}
+    throw new Error("Missing return statement in function");
   }
 
 /*
@@ -1630,15 +1907,20 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
     }
   }
 
-  static final public void PrintExpression() throws ParseException {
+  static final public String PrintExpression() throws ParseException {
+  StringBuffer buff = new StringBuffer("print ");
+  String expr;
     jj_consume_token(PRINT);
-    Expression();
+    expr = Expression();
+    buff.append(expr);
+    {if (true) return buff.toString();}
+    throw new Error("Missing return statement in function");
   }
 
   static final public void EchoStatement() throws ParseException {
     jj_consume_token(ECHO);
     Expression();
-    label_25:
+    label_22:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case COMMA:
@@ -1646,7 +1928,7 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
         break;
       default:
         jj_la1[67] = jj_gen;
-        break label_25;
+        break label_22;
       }
       jj_consume_token(COMMA);
       Expression();
@@ -1674,7 +1956,7 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
   static final public void GlobalStatement() throws ParseException {
     jj_consume_token(GLOBAL);
     VariableDeclaratorId();
-    label_26:
+    label_23:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case COMMA:
@@ -1682,7 +1964,7 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
         break;
       default:
         jj_la1[69] = jj_gen;
-        break label_26;
+        break label_23;
       }
       jj_consume_token(COMMA);
       VariableDeclaratorId();
@@ -1704,7 +1986,7 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
   static final public void StaticStatement() throws ParseException {
     jj_consume_token(STATIC);
     VariableDeclarator();
-    label_27:
+    label_24:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case COMMA:
@@ -1712,7 +1994,7 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
         break;
       default:
         jj_la1[71] = jj_gen;
-        break label_27;
+        break label_24;
       }
       jj_consume_token(COMMA);
       VariableDeclarator();
@@ -1739,7 +2021,7 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
 
   static final public void Block() throws ParseException {
     jj_consume_token(LBRACE);
-    label_28:
+    label_25:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case CLASS:
@@ -1785,7 +2067,7 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
         break;
       default:
         jj_la1[73] = jj_gen;
-        break label_28;
+        break label_25;
       }
       BlockStatement();
     }
@@ -1848,7 +2130,7 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
 
   static final public void LocalVariableDeclaration() throws ParseException {
     VariableDeclarator();
-    label_29:
+    label_26:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case COMMA:
@@ -1856,7 +2138,7 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
         break;
       default:
         jj_la1[75] = jj_gen;
-        break label_29;
+        break label_26;
       }
       jj_consume_token(COMMA);
       VariableDeclarator();
@@ -1945,7 +2227,7 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
     Expression();
     jj_consume_token(RPAREN);
     jj_consume_token(LBRACE);
-    label_30:
+    label_27:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case CASE:
@@ -1954,10 +2236,10 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
         break;
       default:
         jj_la1[79] = jj_gen;
-        break label_30;
+        break label_27;
       }
       SwitchLabel();
-      label_31:
+      label_28:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case CLASS:
@@ -2003,7 +2285,7 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
           break;
         default:
           jj_la1[80] = jj_gen;
-          break label_31;
+          break label_28;
         }
         BlockStatement();
       }
@@ -2033,7 +2315,7 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
     jj_consume_token(IF);
     Condition("if");
     Statement();
-    label_32:
+    label_29:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case ELSEIF:
@@ -2041,7 +2323,7 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
         break;
       default:
         jj_la1[82] = jj_gen;
-        break label_32;
+        break label_29;
       }
       ElseIfStatement();
     }
@@ -2090,7 +2372,7 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case COLON:
       jj_consume_token(COLON);
-      label_33:
+      label_30:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case IF:
@@ -2134,7 +2416,7 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
           break;
         default:
           jj_la1[84] = jj_gen;
-          break label_33;
+          break label_30;
         }
         Statement();
       }
@@ -2308,7 +2590,7 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
 
   static final public void StatementExpressionList() throws ParseException {
     StatementExpression();
-    label_34:
+    label_31:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case COMMA:
@@ -2316,7 +2598,7 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
         break;
       default:
         jj_la1[92] = jj_gen;
-        break label_34;
+        break label_31;
       }
       jj_consume_token(COMMA);
       StatementExpression();
@@ -2434,1400 +2716,1394 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
     return retval;
   }
 
-  static final private boolean jj_3R_91() {
-    if (jj_scan_token(SC_OR)) return true;
+  static final private boolean jj_3R_43() {
+    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_77() {
-    if (jj_scan_token(REMASSIGN)) return true;
+  static final private boolean jj_3R_135() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_137()) {
+    jj_scanpos = xsp;
+    if (jj_3R_138()) {
+    jj_scanpos = xsp;
+    if (jj_3R_139()) {
+    jj_scanpos = xsp;
+    if (jj_3R_140()) {
+    jj_scanpos = xsp;
+    if (jj_3R_141()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_101() {
-    if (jj_3R_103()) return true;
+  static final private boolean jj_3R_137() {
+    if (jj_scan_token(BANG)) return true;
+    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;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_104()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
     return false;
   }
 
-  static final private boolean jj_3R_73() {
+  static final private boolean jj_3R_34() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_91()) {
+    if (jj_3R_42()) {
+    jj_scanpos = xsp;
+    if (jj_3R_43()) {
     jj_scanpos = xsp;
-    if (jj_3R_92()) return true;
+    if (jj_3R_44()) {
+    jj_scanpos = xsp;
+    if (jj_3R_45()) {
+    jj_scanpos = xsp;
+    if (jj_3R_46()) {
+    jj_scanpos = xsp;
+    if (jj_3R_47()) {
+    jj_scanpos = xsp;
+    if (jj_3R_48()) {
+    jj_scanpos = xsp;
+    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;
-    if (jj_3R_72()) 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;
+    } 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_42() {
+    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_96() {
-    if (jj_scan_token(SC_AND)) return true;
+  static final private boolean jj_3R_132() {
+    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_90() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_96()) {
-    jj_scanpos = xsp;
-    if (jj_3R_97()) return true;
+  static final private boolean jj_3R_134() {
+    if (jj_scan_token(DECR)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_89()) return true;
+    if (jj_3R_136()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_98() {
-    if (jj_3R_101()) return true;
+  static final private boolean jj_3R_53() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_52()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_102()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
     return false;
   }
 
-  static final private boolean jj_3R_68() {
-    if (jj_scan_token(HOOK)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_38()) return true;
+  static final private boolean jj_3R_130() {
+    if (jj_scan_token(REM)) 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_133() {
+    if (jj_scan_token(INCR)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_60()) return true;
+    if (jj_3R_136()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_94() {
-    if (jj_3R_98()) return true;
+  static final private boolean jj_3R_127() {
+    if (jj_3R_135()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_99()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
     return false;
   }
 
-  static final private boolean jj_3R_76() {
-    if (jj_scan_token(SLASHASSIGN)) return true;
+  static final private boolean jj_3R_126() {
+    if (jj_3R_134()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_89() {
-    if (jj_3R_94()) return true;
+  static final private boolean jj_3R_125() {
+    if (jj_3R_133()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_95()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
     return false;
   }
 
-  static final private boolean jj_3R_72() {
-    if (jj_3R_89()) return true;
+  static final private boolean jj_3R_129() {
+    if (jj_scan_token(SLASH)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_90()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
     return false;
   }
 
-  static final private boolean jj_3R_67() {
-    if (jj_3R_72()) return true;
+  static final private boolean jj_3R_39() {
+    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_73()) { jj_scanpos = xsp; break; }
+      if (jj_3R_53()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_75() {
-    if (jj_scan_token(STARASSIGN)) return true;
+  static final private boolean jj_3R_131() {
+    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_60() {
-    if (jj_3R_67()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+  static final private boolean jj_3R_124() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_68()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_74() {
-    if (jj_scan_token(ASSIGN)) return true;
+    if (jj_3R_131()) {
+    jj_scanpos = xsp;
+    if (jj_3R_132()) 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_119()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_69() {
+  static final private boolean jj_3R_119() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_74()) {
-    jj_scanpos = xsp;
-    if (jj_3R_75()) {
-    jj_scanpos = xsp;
-    if (jj_3R_76()) {
-    jj_scanpos = xsp;
-    if (jj_3R_77()) {
-    jj_scanpos = xsp;
-    if (jj_3R_78()) {
-    jj_scanpos = xsp;
-    if (jj_3R_79()) {
-    jj_scanpos = xsp;
-    if (jj_3R_80()) {
+    if (jj_3R_123()) {
     jj_scanpos = xsp;
-    if (jj_3R_81()) {
-    jj_scanpos = xsp;
-    if (jj_3R_82()) {
-    jj_scanpos = xsp;
-    if (jj_3R_83()) {
+    if (jj_3R_124()) {
     jj_scanpos = xsp;
-    if (jj_3R_84()) {
+    if (jj_3R_125()) {
     jj_scanpos = xsp;
-    if (jj_3R_85()) {
+    if (jj_3R_126()) {
     jj_scanpos = xsp;
-    if (jj_3R_86()) return true;
+    if (jj_3R_127()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } 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_61() {
-    if (jj_3R_69()) return true;
+  static final private boolean jj_3R_123() {
+    if (jj_scan_token(AT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_38()) return true;
+    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(COMMA)) return true;
+  static final private boolean jj_3R_118() {
+    if (jj_scan_token(RUNSIGNEDSHIFT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_55()) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_122() {
+    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_54() {
-    if (jj_3R_60()) return true;
+  static final private boolean jj_3R_128() {
+    if (jj_scan_token(STAR)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_61()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_38() {
+  static final private boolean jj_3R_120() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_53()) {
+    if (jj_3R_128()) {
     jj_scanpos = xsp;
-    if (jj_3R_54()) return true;
+    if (jj_3R_129()) {
+    jj_scanpos = xsp;
+    if (jj_3R_130()) 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_53() {
-    if (jj_3R_59()) return true;
+    } 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_52() {
-    if (jj_scan_token(INTEGER)) return true;
+  static final private boolean jj_3R_38() {
+    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_51() {
-    if (jj_scan_token(INT)) return true;
+    if (jj_scan_token(COLON)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_50() {
-    if (jj_scan_token(FLOAT)) return true;
+  static final private boolean jj_3R_113() {
+    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_49() {
-    if (jj_scan_token(DOUBLE)) return true;
+  static final private boolean jj_3R_114() {
+    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_48() {
-    if (jj_scan_token(REAL)) 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_33()) 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(BOOLEAN)) return true;
+  static final private boolean jj_3R_174() {
+    if (jj_3R_33()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_2()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
     return false;
   }
 
-  static final private boolean jj_3R_46() {
-    if (jj_scan_token(BOOL)) return true;
+  static final private boolean jj_3R_117() {
+    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_42() {
-    if (jj_3R_55()) return true;
+  static final private boolean jj_3R_121() {
+    if (jj_scan_token(PLUS)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_56()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
     return false;
   }
 
-  static final private boolean jj_3R_37() {
+  static final private boolean jj_3R_115() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_45()) {
+    if (jj_3R_121()) {
     jj_scanpos = xsp;
-    if (jj_3R_46()) {
-    jj_scanpos = xsp;
-    if (jj_3R_47()) {
-    jj_scanpos = xsp;
-    if (jj_3R_48()) {
-    jj_scanpos = xsp;
-    if (jj_3R_49()) {
-    jj_scanpos = xsp;
-    if (jj_3R_50()) {
-    jj_scanpos = xsp;
-    if (jj_3R_51()) {
-    jj_scanpos = xsp;
-    if (jj_3R_52()) return true;
+    if (jj_3R_122()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } 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_45() {
-    if (jj_scan_token(STRING)) return true;
+    if (jj_3R_114()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_41() {
-    if (jj_scan_token(IDENTIFIER)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(COLON)) return true;
+  static final private boolean jj_3R_112() {
+    if (jj_scan_token(LE)) 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;
+  static final private boolean jj_3R_163() {
+    if (jj_scan_token(LPAREN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_36()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_174()) 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_177() {
-    if (jj_3R_36()) return true;
+  static final private boolean jj_3R_108() {
+    if (jj_3R_114()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3_2()) { jj_scanpos = xsp; break; }
+      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_178() {
+  static final private boolean jj_3R_175() {
     if (jj_scan_token(ARRAYASSIGN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_38()) return true;
+    if (jj_3R_35()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_59() {
+  static final private boolean jj_3R_33() {
+    if (jj_3R_35()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_175()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_56() {
     if (jj_scan_token(PRINT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_38()) return true;
+    if (jj_3R_35()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_166() {
-    if (jj_scan_token(LPAREN)) return true;
+  static final private boolean jj_3R_116() {
+    if (jj_scan_token(LSHIFT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_97() {
+    if (jj_scan_token(LBRACE)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_35()) return true;
+    if (jj_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_109() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_177()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(RPAREN)) return true;
+    if (jj_3R_116()) {
+    jj_scanpos = xsp;
+    if (jj_3R_117()) {
+    jj_scanpos = xsp;
+    if (jj_3R_118()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_108()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_36() {
-    if (jj_3R_38()) return true;
+  static final private boolean jj_3R_111() {
+    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_104() {
+    if (jj_3R_108()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_178()) { jj_scanpos = xsp; break; }
+      if (jj_3R_109()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_100() {
-    if (jj_scan_token(LBRACE)) return true;
+  static final private boolean jj_3R_68() {
+    if (jj_3R_35()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_38()) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_63() {
+    if (jj_scan_token(DOLLAR)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(RBRACE)) return true;
+    if (jj_3R_54()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_71() {
-    if (jj_3R_38()) return true;
+  static final private boolean jj_3R_110() {
+    if (jj_scan_token(LT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_93() {
-    if (jj_scan_token(LBRACE)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_38()) return true;
+  static final private boolean jj_3R_105() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_110()) {
+    jj_scanpos = xsp;
+    if (jj_3R_111()) {
+    jj_scanpos = xsp;
+    if (jj_3R_112()) {
+    jj_scanpos = xsp;
+    if (jj_3R_113()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(RBRACE)) return true;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_104()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_63() {
-    if (jj_scan_token(ASSIGN)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_71()) return true;
+  static final private boolean jj_3R_107() {
+    if (jj_scan_token(NE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_66() {
-    if (jj_scan_token(DOLLAR)) return true;
+  static final private boolean jj_3R_90() {
+    if (jj_scan_token(LBRACE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_57()) return true;
+    if (jj_3R_35()) 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_65() {
+  static final private boolean jj_3R_62() {
     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_97()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_102() {
+    if (jj_3R_104()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_100()) { 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_64() {
+  static final private boolean jj_3R_61() {
     if (jj_scan_token(LBRACE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_38()) return true;
+    if (jj_3R_35()) 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_57() {
+  static final private boolean jj_3R_54() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_64()) {
+    if (jj_3R_61()) {
     jj_scanpos = xsp;
-    if (jj_3R_65()) {
+    if (jj_3R_62()) {
     jj_scanpos = xsp;
-    if (jj_3R_66()) return true;
+    if (jj_3R_63()) 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_3_1() {
-    if (jj_3R_35()) return true;
+  static final private boolean jj_3R_37() {
+    if (jj_scan_token(127)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_40() {
-    if (jj_scan_token(127)) return true;
+  static final private boolean jj_3R_85() {
+    if (jj_scan_token(DOLLAR)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_54()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_88() {
-    if (jj_scan_token(DOLLAR)) return true;
+  static final private boolean jj_3R_106() {
+    if (jj_scan_token(EQ)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_57()) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_103() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_106()) {
+    jj_scanpos = xsp;
+    if (jj_3R_107()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_102()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_87() {
+  static final private boolean jj_3R_36() {
+    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_84() {
     if (jj_scan_token(DOLLAR_ID)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_93()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
+    xsp = jj_scanpos;
+    if (jj_3R_90()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_70() {
+  static final private boolean jj_3R_67() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_87()) {
+    if (jj_3R_84()) {
     jj_scanpos = xsp;
-    if (jj_3R_88()) return true;
+    if (jj_3R_85()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_62() {
-    if (jj_3R_70()) return true;
+  static final private boolean jj_3R_100() {
+    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_1()) { 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_39() {
-    if (jj_scan_token(SEMICOLON)) return true;
+  static final private boolean jj_3_1() {
+    if (jj_3R_32()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_55() {
-    if (jj_3R_62()) return true;
+  static final private boolean jj_3_6() {
+    if (jj_3R_38()) 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;
     return false;
   }
 
-  static final private boolean jj_3_6() {
-    if (jj_3R_41()) return true;
+  static final private boolean jj_3R_59() {
+    if (jj_3R_67()) 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_3_5() {
-    if (jj_3R_38()) return true;
+    if (jj_3R_35()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_39()) {
+    if (jj_3R_36()) {
     jj_scanpos = xsp;
-    if (jj_3R_40()) return true;
+    if (jj_3R_37()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_181() {
-    if (jj_scan_token(COMMA)) return true;
+  static final private boolean jj_3R_101() {
+    if (jj_scan_token(BIT_AND)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_38()) return true;
+    if (jj_3R_100()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_180() {
-    if (jj_3R_38()) return true;
+  static final private boolean jj_3R_60() {
+    if (jj_scan_token(ASSIGN)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_68()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_98() {
+    if (jj_3R_100()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_181()) { jj_scanpos = xsp; break; }
+      if (jj_3R_101()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_179() {
-    if (jj_3R_180()) 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(LPAREN)) return true;
+  static final private boolean jj_3R_52() {
+    if (jj_3R_59()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_179()) jj_scanpos = xsp;
+    if (jj_3R_60()) 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_163() {
-    if (jj_scan_token(NULL)) return true;
+  static final private boolean jj_3R_178() {
+    if (jj_scan_token(COMMA)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_168() {
-    if (jj_scan_token(FALSE)) return true;
+    if (jj_3R_35()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_162() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_167()) {
-    jj_scanpos = xsp;
-    if (jj_3R_168()) return true;
+  static final private boolean jj_3R_177() {
+    if (jj_3R_35()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_178()) { 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(TRUE)) return true;
+  static final private boolean jj_3R_99() {
+    if (jj_scan_token(XOR)) 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(DOTASSIGN)) return true;
+    if (jj_3R_98()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_156() {
-    if (jj_3R_163()) return true;
+  static final private boolean jj_3R_95() {
+    if (jj_3R_98()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_99()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
     return false;
   }
 
-  static final private boolean jj_3R_155() {
-    if (jj_3R_162()) return true;
+  static final private boolean jj_3R_176() {
+    if (jj_3R_177()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
   static final private boolean jj_3R_173() {
-    if (jj_3R_169()) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_176()) 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_58() {
-    if (jj_3R_38()) return true;
+  static final private boolean jj_3R_96() {
+    if (jj_scan_token(BIT_OR)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_95()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_85() {
-    if (jj_scan_token(ORASSIGN)) return true;
+  static final private boolean jj_3R_91() {
+    if (jj_3R_95()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_96()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
     return false;
   }
 
-  static final private boolean jj_3R_154() {
-    if (jj_scan_token(STRING_LITERAL)) return true;
+  static final private boolean jj_3R_160() {
+    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_153() {
-    if (jj_scan_token(FLOATING_POINT_LITERAL)) return true;
+  static final private boolean jj_3R_165() {
+    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_149() {
+  static final private boolean jj_3R_159() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_152()) {
-    jj_scanpos = xsp;
-    if (jj_3R_153()) {
-    jj_scanpos = xsp;
-    if (jj_3R_154()) {
+    if (jj_3R_164()) {
     jj_scanpos = xsp;
-    if (jj_3R_155()) {
-    jj_scanpos = xsp;
-    if (jj_3R_156()) return true;
+    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_152() {
-    if (jj_scan_token(INTEGER_LITERAL)) return true;
+  static final private boolean jj_3R_164() {
+    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_44() {
-    if (jj_scan_token(LBRACKET)) return true;
+  static final private boolean jj_3R_153() {
+    if (jj_3R_160()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_58()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(RBRACKET)) return true;
+    return false;
+  }
+
+  static final private boolean jj_3R_94() {
+    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_43() {
-    if (jj_scan_token(CLASSACCESS)) return true;
+  static final private boolean jj_3R_92() {
+    if (jj_scan_token(DOT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_57()) return true;
+    if (jj_3R_91()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_35() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_43()) {
-    jj_scanpos = xsp;
-    if (jj_3R_44()) return true;
+  static final private boolean jj_3R_152() {
+    if (jj_3R_159()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_84() {
-    if (jj_scan_token(XORASSIGN)) return true;
+  static final private boolean jj_3R_86() {
+    if (jj_3R_91()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_92()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
     return false;
   }
 
-  static final private boolean jj_3R_172() {
-    if (jj_3R_35()) return true;
+  static final private boolean jj_3R_151() {
+    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_171() {
-    if (jj_3R_176()) return true;
+  static final private boolean jj_3R_150() {
+    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_169() {
+  static final private boolean jj_3R_146() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_171()) {
+    if (jj_3R_149()) {
     jj_scanpos = xsp;
-    if (jj_3R_172()) return true;
+    if (jj_3R_150()) {
+    jj_scanpos = xsp;
+    if (jj_3R_151()) {
+    jj_scanpos = xsp;
+    if (jj_3R_152()) {
+    jj_scanpos = xsp;
+    if (jj_3R_153()) 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_161() {
-    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_175() {
-    if (jj_3R_62()) return true;
+  static final private boolean jj_3R_149() {
+    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_174() {
-    if (jj_scan_token(IDENTIFIER)) return true;
+  static final private boolean jj_3R_55() {
+    if (jj_3R_35()) 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(ANDASSIGN)) return true;
+  static final private boolean jj_3R_93() {
+    if (jj_scan_token(SC_AND)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_165() {
-    if (jj_3R_169()) return true;
+  static final private boolean jj_3R_89() {
+    if (jj_scan_token(_ORL)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_170() {
+  static final private boolean jj_3R_87() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_174()) {
+    if (jj_3R_93()) {
     jj_scanpos = xsp;
-    if (jj_3R_175()) return true;
+    if (jj_3R_94()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_151() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_160()) {
-    jj_scanpos = xsp;
-    if (jj_3R_161()) return true;
+    if (jj_3R_86()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_160() {
-    if (jj_scan_token(INCR)) return true;
+  static final private boolean jj_3R_69() {
+    if (jj_3R_86()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_87()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
     return false;
   }
 
-  static final private boolean jj_3R_159() {
-    if (jj_3R_62()) return true;
+  static final private boolean jj_3R_41() {
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_55()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_scan_token(RBRACKET)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_164() {
-    if (jj_scan_token(BIT_AND)) return true;
+  static final private boolean jj_3R_65() {
+    if (jj_scan_token(HOOK)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_35()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_scan_token(COLON)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_57()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_158() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_164()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(NEW)) return true;
+  static final private boolean jj_3R_40() {
+    if (jj_scan_token(CLASSACCESS)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_170()) return true;
+    if (jj_3R_54()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_150() {
+  static final private boolean jj_3R_32() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_157()) {
-    jj_scanpos = xsp;
-    if (jj_3R_158()) {
+    if (jj_3R_40()) {
     jj_scanpos = xsp;
-    if (jj_3R_159()) return true;
+    if (jj_3R_41()) 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_157() {
-    if (jj_scan_token(IDENTIFIER)) return true;
+  static final private boolean jj_3R_169() {
+    if (jj_3R_32()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_146() {
-    if (jj_scan_token(ARRAY)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_166()) return true;
+  static final private boolean jj_3R_88() {
+    if (jj_scan_token(SC_OR)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_145() {
-    if (jj_3R_150()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+  static final private boolean jj_3R_70() {
     Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_165()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
+    xsp = jj_scanpos;
+    if (jj_3R_88()) {
+    jj_scanpos = xsp;
+    if (jj_3R_89()) 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_69()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3_4() {
-    if (jj_scan_token(IDENTIFIER)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(STATICCLASSACCESS)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_170()) return true;
+  static final private boolean jj_3R_168() {
+    if (jj_3R_173()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_173()) { jj_scanpos = xsp; break; }
-      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_166() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3_4()) {
-    jj_scanpos = xsp;
-    if (jj_3R_145()) {
+    if (jj_3R_168()) {
     jj_scanpos = xsp;
-    if (jj_3R_146()) return true;
+    if (jj_3R_169()) 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_82() {
-    if (jj_scan_token(RUNSIGNEDSHIFTASSIGN)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_148() {
-    if (jj_3R_139()) return true;
+  static final private boolean jj_3R_64() {
+    if (jj_3R_69()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_151()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_70()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
     return false;
   }
 
-  static final private boolean jj_3R_147() {
-    if (jj_scan_token(LPAREN)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_37()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(RPAREN)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_122()) return true;
+  static final private boolean jj_3R_172() {
+    if (jj_3R_59()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3_3() {
-    if (jj_scan_token(LPAREN)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_37()) 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_171() {
+    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_121() {
-    if (jj_scan_token(RUNSIGNEDSHIFT)) return true;
+  static final private boolean jj_3R_167() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_171()) {
+    jj_scanpos = xsp;
+    if (jj_3R_172()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_133() {
-    if (jj_scan_token(REM)) return true;
+  static final private boolean jj_3_7() {
+    if (jj_3R_39()) 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(LPAREN)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_38()) 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_156() {
+    if (jj_3R_59()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_143() {
-    if (jj_3R_149()) return true;
+  static final private boolean jj_3R_57() {
+    if (jj_3R_64()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_65()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_142() {
-    if (jj_3R_148()) return true;
+  static final private boolean jj_3R_158() {
+    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_125() {
-    if (jj_scan_token(MINUS)) return true;
+  static final private boolean jj_3R_161() {
+    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_141() {
-    if (jj_3R_147()) return true;
+  static final private boolean jj_3R_155() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_161()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_scan_token(NEW)) 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(RSIGNEDSHIFTASSIGN)) return true;
+    if (jj_3R_167()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_138() {
+  static final private boolean jj_3R_147() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_140()) {
-    jj_scanpos = xsp;
-    if (jj_3R_141()) {
-    jj_scanpos = xsp;
-    if (jj_3R_142()) {
+    if (jj_3R_154()) {
     jj_scanpos = xsp;
-    if (jj_3R_143()) {
+    if (jj_3R_155()) {
     jj_scanpos = xsp;
-    if (jj_3R_144()) return true;
+    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;
     } 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_140() {
-    if (jj_scan_token(BANG)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_122()) return true;
+  static final private boolean jj_3R_154() {
+    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_132() {
-    if (jj_scan_token(SLASH)) return true;
+  static final private boolean jj_3R_83() {
+    if (jj_scan_token(DOTASSIGN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_137() {
-    if (jj_scan_token(DECR)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_139()) return true;
+  static final private boolean jj_3R_82() {
+    if (jj_scan_token(ORASSIGN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_116() {
-    if (jj_scan_token(GE)) return true;
+  static final private boolean jj_3R_81() {
+    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_124() {
-    if (jj_scan_token(PLUS)) return true;
+  static final private boolean jj_3R_80() {
+    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_120() {
-    if (jj_scan_token(RSIGNEDSHIFT)) return true;
+  static final private boolean jj_3R_79() {
+    if (jj_scan_token(RUNSIGNEDSHIFTASSIGN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_118() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_124()) {
-    jj_scanpos = xsp;
-    if (jj_3R_125()) return true;
+  static final private boolean jj_3R_143() {
+    if (jj_scan_token(ARRAY)) 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_117()) return true;
+    if (jj_3R_163()) 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(STAR)) return true;
+  static final private boolean jj_3R_78() {
+    if (jj_scan_token(RSIGNEDSHIFTASSIGN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3_7() {
-    if (jj_3R_42()) return true;
+  static final private boolean jj_3R_77() {
+    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_123() {
+  static final private boolean jj_3R_148() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_131()) {
-    jj_scanpos = xsp;
-    if (jj_3R_132()) {
+    if (jj_3R_157()) {
     jj_scanpos = xsp;
-    if (jj_3R_133()) return true;
+    if (jj_3R_158()) 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_122()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_136() {
+  static final private boolean jj_3R_157() {
     if (jj_scan_token(INCR)) 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_135() {
-    if (jj_scan_token(MINUS)) return true;
+  static final private boolean jj_3R_76() {
+    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_115() {
-    if (jj_scan_token(LE)) return true;
+  static final private boolean jj_3R_162() {
+    if (jj_3R_166()) 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(LSHIFTASSIGN)) return true;
+  static final private boolean jj_3R_75() {
+    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_130() {
-    if (jj_3R_138()) return true;
+  static final private boolean jj_3R_142() {
+    if (jj_3R_147()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_162()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
     return false;
   }
 
-  static final private boolean jj_3R_119() {
-    if (jj_scan_token(LSHIFT)) return true;
+  static final private boolean jj_3R_74() {
+    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_129() {
-    if (jj_3R_137()) return true;
+  static final private boolean jj_3R_73() {
+    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_112() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_119()) {
-    jj_scanpos = xsp;
-    if (jj_3R_120()) {
-    jj_scanpos = xsp;
-    if (jj_3R_121()) 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_111()) return true;
+  static final private boolean jj_3R_170() {
+    if (jj_3R_166()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_114() {
-    if (jj_scan_token(GT)) return true;
+  static final private boolean jj_3R_72() {
+    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_110() {
-    if (jj_scan_token(NE)) return true;
+  static final private boolean jj_3R_71() {
+    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_128() {
-    if (jj_3R_136()) return true;
+  static final private boolean jj_3R_66() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_71()) {
+    jj_scanpos = xsp;
+    if (jj_3R_72()) {
+    jj_scanpos = xsp;
+    if (jj_3R_73()) {
+    jj_scanpos = xsp;
+    if (jj_3R_74()) {
+    jj_scanpos = xsp;
+    if (jj_3R_75()) {
+    jj_scanpos = xsp;
+    if (jj_3R_76()) {
+    jj_scanpos = xsp;
+    if (jj_3R_77()) {
+    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;
+    } 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_134() {
-    if (jj_scan_token(PLUS)) return true;
+  static final private boolean jj_3_4() {
+    if (jj_scan_token(IDENTIFIER)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_127() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_134()) {
-    jj_scanpos = xsp;
-    if (jj_3R_135()) return true;
+    if (jj_scan_token(STATICCLASSACCESS)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_122()) return true;
+    if (jj_3R_167()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_170()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
     return false;
   }
 
-  static final private boolean jj_3R_122() {
+  static final private boolean jj_3R_136() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_126()) {
-    jj_scanpos = xsp;
-    if (jj_3R_127()) {
-    jj_scanpos = xsp;
-    if (jj_3R_128()) {
+    if (jj_3_4()) {
     jj_scanpos = xsp;
-    if (jj_3R_129()) {
+    if (jj_3R_142()) {
     jj_scanpos = xsp;
-    if (jj_3R_130()) return true;
+    if (jj_3R_143()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } 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_126() {
-    if (jj_scan_token(AT)) return true;
+  static final private boolean jj_3R_58() {
+    if (jj_3R_66()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_122()) return true;
+    if (jj_3R_35()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_113() {
-    if (jj_scan_token(LT)) return true;
+  static final private boolean jj_3R_145() {
+    if (jj_3R_136()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_148()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_109() {
-    if (jj_scan_token(EQ)) return true;
+  static final private boolean jj_3R_51() {
+    if (jj_3R_57()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_108() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_113()) {
-    jj_scanpos = xsp;
-    if (jj_3R_114()) {
-    jj_scanpos = xsp;
-    if (jj_3R_115()) {
-    jj_scanpos = xsp;
-    if (jj_3R_116()) 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_107()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_58()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_106() {
+  static final private boolean jj_3R_35() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_109()) {
+    if (jj_3R_50()) {
     jj_scanpos = xsp;
-    if (jj_3R_110()) return true;
+    if (jj_3R_51()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_105()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_117() {
-    if (jj_3R_122()) return true;
+  static final private boolean jj_3R_50() {
+    if (jj_3R_56()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_123()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
     return false;
   }
 
-  static final private boolean jj_3R_79() {
-    if (jj_scan_token(MINUSASSIGN)) return true;
+  static final private boolean jj_3R_144() {
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_34()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_scan_token(RPAREN)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_119()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_111() {
-    if (jj_3R_117()) return true;
+  static final private boolean jj_3R_49() {
+    if (jj_scan_token(INTEGER)) 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_104() {
-    if (jj_scan_token(BIT_AND)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_103()) return true;
+  static final private boolean jj_3R_48() {
+    if (jj_scan_token(INT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_107() {
-    if (jj_3R_111()) return true;
+  static final private boolean jj_3_3() {
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_34()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_scan_token(RPAREN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_112()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
     return false;
   }
 
-  static final private boolean jj_3R_78() {
-    if (jj_scan_token(PLUSASSIGN)) return true;
+  static final private boolean jj_3R_141() {
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_35()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_scan_token(RPAREN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_99() {
-    if (jj_scan_token(BIT_OR)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_98()) return true;
+  static final private boolean jj_3R_47() {
+    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_102() {
-    if (jj_scan_token(XOR)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_101()) return true;
+  static final private boolean jj_3R_140() {
+    if (jj_3R_146()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_105() {
-    if (jj_3R_107()) return true;
+  static final private boolean jj_3R_46() {
+    if (jj_scan_token(DOUBLE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    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;
-    }
     return false;
   }
 
-  static final private boolean jj_3R_92() {
-    if (jj_scan_token(_ORL)) return true;
+  static final private boolean jj_3R_139() {
+    if (jj_3R_145()) 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(_ANDL)) return true;
+  static final private boolean jj_3R_45() {
+    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_95() {
-    if (jj_scan_token(DOT)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_94()) return true;
+  static final private boolean jj_3R_44() {
+    if (jj_scan_token(BOOLEAN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_103() {
-    if (jj_3R_105()) return true;
+  static final private boolean jj_3R_138() {
+    if (jj_3R_144()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_106()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
     return false;
   }
 

diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.jj b/net.sourceforge.phpeclipse/src/test/PHPParser.jj
index 9bf7ec4..a6bce7c 100644 (file)
--- a/net.sourceforge.phpeclipse/src/test/PHPParser.jj
+++ b/net.sourceforge.phpeclipse/src/test/PHPParser.jj
@@ -585,52 +585,110 @@ void FieldDeclaration() :
   <VAR> VariableDeclarator() ( <COMMA> VariableDeclarator() )* <SEMICOLON>
 }
 
-void VariableDeclarator() :
-{}
+String VariableDeclarator() :
+{
+  String expr;
+  StringBuffer buff = new StringBuffer();
+}
 {
-  VariableDeclaratorId() [ <ASSIGN> VariableInitializer() ]
+  expr = VariableDeclaratorId()
+  {buff.append(expr);}
+  [ <ASSIGN> expr = VariableInitializer()
+    {buff.append("=").append(expr);}
+  ]
+  {return buff.toString();}
 }
 
-void VariableDeclaratorId() :
-{}
+String VariableDeclaratorId() :
+{
+  String expr;
+  StringBuffer buff = new StringBuffer();
+}
 {
-  Variable() ( LOOKAHEAD(2) VariableSuffix() )*
+  expr = Variable()
+  {buff.append(expr);}
+  ( LOOKAHEAD(2) expr = VariableSuffix()
+  {buff.append(expr);}
+  )*
+  {return buff.toString();}
 }
 
-void Variable():
-{}
+String Variable():
+{
+  String expr = null;
+  Token token;
+}
 {
-  <DOLLAR_ID> (<LBRACE> Expression() <RBRACE>) *
+  token = <DOLLAR_ID> [<LBRACE> expr = Expression() <RBRACE>]
+  {
+    if (expr == null) {
+      return token.image;
+    }
+    return token + "{" + expr + "}";
+  }
 |
-  <DOLLAR> VariableName()
+  <DOLLAR> expr = VariableName()
+  {return "$" + expr;}
 }
 
 String VariableName():
-{}
 {
-  <LBRACE> Expression() <RBRACE>
-|
-  <IDENTIFIER> (<LBRACE> Expression() <RBRACE>) *
+String expr = null;
+Token token;
+}
+{
+  <LBRACE> expr = Expression() <RBRACE>
+  {return "{"+expr+"}";}
 |
-  <DOLLAR> VariableName()
+  token = <IDENTIFIER> [<LBRACE> expr = Expression() <RBRACE>]
+  {
+    if (expr == null) {
+      return token.image;
+    }
+    return token + "{" + expr + "}";
+  }|
+  <DOLLAR> expr = VariableName()
+  {return "$" + expr;}
 }
 
-void VariableInitializer() :
-{}
+String VariableInitializer() :
 {
-  Expression()
+  String expr;
+}
+{
+  expr = Expression()
+  {return expr;}
 }
 
-void ArrayVariable() :
-{}
+String ArrayVariable() :
 {
-  Expression() (<ARRAYASSIGN> Expression())*
+String expr;
+StringBuffer buff = new StringBuffer();
+}
+{
+  expr = Expression()
+  {buff.append(expr);}
+   [<ARRAYASSIGN> expr = Expression()
+   {buff.append("=>").append(expr);}]
+  {return buff.toString();}
 }
 
-void ArrayInitializer() :
-{}
+String ArrayInitializer() :
+{
+String expr = null;
+StringBuffer buff = new StringBuffer("(");
+}
 {
-  <LPAREN> [ ArrayVariable() ( LOOKAHEAD(2) <COMMA> ArrayVariable() )* ]<RPAREN>
+  <LPAREN> [ expr = ArrayVariable()
+            {buff.append(expr);}
+            ( LOOKAHEAD(2) <COMMA> expr = ArrayVariable()
+            {buff.append(",").append(expr);}
+            )* ]
+  <RPAREN>
+  {
+    buff.append(")");
+    return buff.toString();
+  }
 }
 
 void MethodDeclaration() :
@@ -651,281 +709,622 @@ void MethodDeclaration() :
 
 PHPFunctionDeclaration MethodDeclarator() :
 {
-  Token bit_and = null;
   Token identifier;
   StringBuffer methodDeclaration = new StringBuffer();
   String formalParameters;
   int pos = jj_input_stream.bufpos;
 }
 {
-  [ bit_and = <BIT_AND>]
-  identifier = <IDENTIFIER> FormalParameters()
+  [ <BIT_AND> {methodDeclaration.append("&");}]
+  identifier = <IDENTIFIER> formalParameters = FormalParameters()
   {
-    if (bit_and != null) {
-      methodDeclaration.append("&");
-    }
-    methodDeclaration.append(identifier);
+    methodDeclaration.append(identifier).append(formalParameters);
     return new PHPFunctionDeclaration(currentSegment,methodDeclaration.toString(),pos);
   }
 }
 
-void FormalParameters() :
-{}
+String FormalParameters() :
+{
+  String expr;
+  StringBuffer buff = new StringBuffer("(");
+}
 {
-  <LPAREN> [ FormalParameter() ( <COMMA> FormalParameter() )* ] <RPAREN>
+  <LPAREN> [ expr = FormalParameter() {buff.append(expr);}
+            ( <COMMA> expr = FormalParameter()
+            {buff.append(",").append(expr);}
+            )* ] <RPAREN>
+ {
+  buff.append(")");
+  return buff.toString();
+ }
 }
 
-void FormalParameter() :
-{}
+String FormalParameter() :
+{
+  String expr;
+  StringBuffer buff = new StringBuffer();
+}
 {
-  [<BIT_AND>] VariableDeclarator()
+  [<BIT_AND> {buff.append("&");}] expr = VariableDeclarator()
+  {
+    buff.append(expr);
+    return buff.toString();
+  }
 }
 
-void Type() :
+String Type() :
 {}
 {
   <STRING>
+  {return "string";}
 |
   <BOOL>
+  {return "bool";}
 |
   <BOOLEAN>
+  {return "boolean";}
 |
   <REAL>
+  {return "real";}
 |
   <DOUBLE>
+  {return "double";}
 |
   <FLOAT>
+  {return "float";}
 |
   <INT>
+  {return "int";}
 |
   <INTEGER>
+  {return "integer";}
 }
 
-void Expression() :
-{}
+String Expression() :
+{
+  String expr;
+  String assignOperator = null;
+  String expr2 = null;
+}
 {
-  PrintExpression()
+  expr = PrintExpression()
+  {return expr;}
 |
-  ConditionalExpression()
+  expr = ConditionalExpression()
   [
-    AssignmentOperator() Expression()
+    assignOperator = AssignmentOperator()
+    expr2 = Expression()
   ]
+  {
+    if (expr2 == null) {
+      return expr;
+    } else {
+      return expr + assignOperator + expr2;
+    }
+  }
 }
 
-void AssignmentOperator() :
-{}
-{
-  <ASSIGN> | <STARASSIGN> | <SLASHASSIGN> | <REMASSIGN> | <PLUSASSIGN> | <MINUSASSIGN> | <LSHIFTASSIGN> | <RSIGNEDSHIFTASSIGN> | <RUNSIGNEDSHIFTASSIGN> | <ANDASSIGN> | <XORASSIGN> | <ORASSIGN> | <DOTASSIGN>
+String AssignmentOperator() :
+{
+  Token assignOperator;
+}
+{
+  <ASSIGN>
+{return "=";}
+| <STARASSIGN>
+{return "*=";}
+| <SLASHASSIGN>
+{return "/=";}
+| <REMASSIGN>
+{return "%=";}
+| <PLUSASSIGN>
+{return "+=";}
+| <MINUSASSIGN>
+{return "-=";}
+| <LSHIFTASSIGN>
+{return "<<=";}
+| <RSIGNEDSHIFTASSIGN>
+{return ">>=";}
+| <RUNSIGNEDSHIFTASSIGN>
+{return ">>>=";}
+| <ANDASSIGN>
+{return "&=";}
+| <XORASSIGN>
+{return "|=";}
+| <ORASSIGN>
+{return "|=";}
+| <DOTASSIGN>
+{return ".=";}
+}
+
+String ConditionalExpression() :
+{
+  String expr;
+  String expr2 = null;
+  String expr3 = null;
+}
+{
+  expr = ConditionalOrExpression() [ <HOOK> expr2 = Expression() <COLON> expr3 = ConditionalExpression() ]
+{
+  if (expr3 == null) {
+    return expr;
+  } else {
+    return expr + "?" + expr2 + ":" + expr3;
+  }
+}
 }
 
-void ConditionalExpression() :
-{}
+String ConditionalOrExpression() :
 {
-  ConditionalOrExpression() [ <HOOK> Expression() <COLON> ConditionalExpression() ]
+  String expr;
+  Token operator;
+  String expr2 = null;
+  StringBuffer buff = new StringBuffer();
 }
-
-void ConditionalOrExpression() :
-{}
 {
-  ConditionalAndExpression() ( (<SC_OR> | <_ORL>) ConditionalAndExpression() )*
+  expr = ConditionalAndExpression()
+  {
+    buff.append(expr);
+  }
+  (
+    (operator = <SC_OR> | operator = <_ORL>) expr2 = ConditionalAndExpression()
+    {
+      buff.append(operator.image);
+      buff.append(expr2);
+    }
+  )*
+  {
+    return buff.toString();
+  }
 }
 
-void ConditionalAndExpression() :
-{}
+String ConditionalAndExpression() :
+{
+  String expr;
+  Token operator;
+  String expr2 = null;
+  StringBuffer buff = new StringBuffer();
+}
 {
-  ConcatExpression() ( (<SC_AND> | <_ANDL>) ConcatExpression() )*
+  expr = ConcatExpression()
+  {
+    buff.append(expr);
+  }
+  (
+  (operator = <SC_AND> | operator = <_ANDL>) expr2 = ConcatExpression()
+    {
+      buff.append(operator.image);
+      buff.append(expr2);
+    }
+  )*
+  {
+    return buff.toString();
+  }
 }
 
-void ConcatExpression() :
-{}
+String ConcatExpression() :
+{
+  String expr;
+  String expr2 = null;
+  StringBuffer buff = new StringBuffer();
+}
 {
-  InclusiveOrExpression() ( <DOT> InclusiveOrExpression() )*
+  expr = InclusiveOrExpression()
+  {
+    buff.append(expr);
+  }
+  (
+  <DOT> expr2 = InclusiveOrExpression()
+  {
+    buff.append(".");
+    buff.append(expr2);
+  }
+  )*
+  {
+    return buff.toString();
+  }
 }
 
-void InclusiveOrExpression() :
-{}
+String InclusiveOrExpression() :
+{
+  String expr;
+  String expr2 = null;
+  StringBuffer buff = new StringBuffer();
+}
 {
-  ExclusiveOrExpression() ( <BIT_OR> ExclusiveOrExpression() )*
+  expr = ExclusiveOrExpression()
+  {
+    buff.append(expr);
+  }
+  (
+  <BIT_OR> expr2 = ExclusiveOrExpression()
+  {
+    buff.append("|");
+    buff.append(expr2);
+  }
+  )*
+  {
+    return buff.toString();
+  }
 }
 
-void ExclusiveOrExpression() :
-{}
+String ExclusiveOrExpression() :
+{
+  String expr;
+  String expr2 = null;
+  StringBuffer buff = new StringBuffer();
+}
 {
-  AndExpression() ( <XOR> AndExpression() )*
+  expr = AndExpression()
+  {
+    buff.append(expr);
+  }
+  (
+    <XOR> expr2 = AndExpression()
+  {
+    buff.append("^");
+    buff.append(expr2);
+  }
+  )*
+  {
+    return buff.toString();
+  }
 }
 
-void AndExpression() :
-{}
+String AndExpression() :
+{
+  String expr;
+  String expr2 = null;
+  StringBuffer buff = new StringBuffer();
+}
 {
-  EqualityExpression() ( <BIT_AND> EqualityExpression() )*
+  expr = EqualityExpression()
+  {
+    buff.append(expr);
+  }
+  (
+    <BIT_AND> expr2 = EqualityExpression()
+  {
+    buff.append("&");
+    buff.append(expr2);
+  }
+  )*
+  {
+    return buff.toString();
+  }
 }
 
-void EqualityExpression() :
-{}
+String EqualityExpression() :
 {
-  RelationalExpression() ( ( <EQ> | <NE> ) RelationalExpression() )*
+  String expr;
+  Token operator;
+  String expr2;
+  StringBuffer buff = new StringBuffer();
+}
+{
+  expr = RelationalExpression()
+  {buff.append(expr);}
+  (
+  ( operator = <EQ> | operator = <NE> ) expr2 = RelationalExpression()
+  {
+    buff.append(operator.image);
+    buff.append(expr2);
+  }
+  )*
+  {return buff.toString();}
 }
 
-void RelationalExpression() :
-{}
+String RelationalExpression() :
 {
-  ShiftExpression() ( ( <LT> | <GT> | <LE> | <GE> ) ShiftExpression() )*
+  String expr;
+  Token operator;
+  String expr2;
+  StringBuffer buff = new StringBuffer();
+}
+{
+  expr = ShiftExpression()
+  {buff.append(expr);}
+  (
+  ( operator = <LT> | operator = <GT> | operator = <LE> | operator = <GE> ) expr2 = ShiftExpression()
+  {
+    buff.append(operator.image);
+    buff.append(expr2);
+  }
+  )*
+  {return buff.toString();}
 }
 
-void ShiftExpression() :
-{}
+String ShiftExpression() :
+{
+  String expr;
+  Token operator;
+  String expr2;
+  StringBuffer buff = new StringBuffer();
+}
 {
-  AdditiveExpression() ( ( <LSHIFT> | <RSIGNEDSHIFT> | <RUNSIGNEDSHIFT> ) AdditiveExpression() )*
+  expr = AdditiveExpression()
+  {buff.append(expr);}
+  (
+  (operator = <LSHIFT> | operator = <RSIGNEDSHIFT> | operator = <RUNSIGNEDSHIFT> ) expr2 = AdditiveExpression()
+  {
+    buff.append(operator.image);
+    buff.append(expr2);
+  }
+  )*
+  {return buff.toString();}
 }
 
-void AdditiveExpression() :
-{}
+String AdditiveExpression() :
 {
-  MultiplicativeExpression() ( ( <PLUS> | <MINUS> ) MultiplicativeExpression() )*
+  String expr;
+  Token operator;
+  String expr2;
+  StringBuffer buff = new StringBuffer();
+}
+{
+  expr = MultiplicativeExpression()
+  {buff.append(expr);}
+  (
+   ( operator = <PLUS> | operator = <MINUS> ) expr2 = MultiplicativeExpression()
+  {
+    buff.append(operator.image);
+    buff.append(expr2);
+  }
+   )*
+  {return buff.toString();}
 }
 
-void MultiplicativeExpression() :
-{}
+String MultiplicativeExpression() :
 {
-  UnaryExpression() ( ( <STAR> | <SLASH> | <REM> ) UnaryExpression() )*
+  String expr;
+  Token operator;
+  String expr2;
+  StringBuffer buff = new StringBuffer();}
+{
+  expr = UnaryExpression()
+  {buff.append(expr);}
+  (
+  ( operator = <STAR> | operator = <SLASH> | operator = <REM> ) expr2 = UnaryExpression()
+  {
+    buff.append(operator.image);
+    buff.append(expr2);
+  }
+  )*
+  {return buff.toString();}
 }
 
-void UnaryExpression() :
-{}
+String UnaryExpression() :
+{
+  String expr;
+  StringBuffer buff = new StringBuffer();
+}
 {
-  <AT> UnaryExpression()
+  <AT> expr = UnaryExpression()
+  {return "@" + expr;}
 |
-  ( <PLUS> | <MINUS> ) UnaryExpression()
+  ( <PLUS> {buff.append("+");}| <MINUS> {buff.append("-");}) expr = UnaryExpression()
+  {
+    buff.append(expr);
+    return buff.toString();
+  }
 |
-  PreIncrementExpression()
+  expr = PreIncrementExpression()
+  {return expr;}
 |
-  PreDecrementExpression()
+  expr = PreDecrementExpression()
+  {return expr;}
 |
-  UnaryExpressionNotPlusMinus()
+  expr = UnaryExpressionNotPlusMinus()
+  {return buff.toString();}
 }
 
-void PreIncrementExpression() :
-{}
+String PreIncrementExpression() :
+{
+String expr;
+}
 {
-  <INCR> PrimaryExpression()
+  <INCR> expr = PrimaryExpression()
+  {return "++"+expr;}
 }
 
-void PreDecrementExpression() :
-{}
+String PreDecrementExpression() :
+{
+String expr;
+}
 {
-  <DECR> PrimaryExpression()
+  <DECR> expr = PrimaryExpression()
+  {return "--"+expr;}
 }
 
-void UnaryExpressionNotPlusMinus() :
-{}
+String UnaryExpressionNotPlusMinus() :
+{
+  String expr;
+}
 {
-  <BANG> UnaryExpression()
+  <BANG> expr = UnaryExpression()
+  {return "!" + expr;}
 |
   LOOKAHEAD( <LPAREN> Type() <RPAREN> )
-  CastExpression()
+  expr = CastExpression()
+  {return expr;}
 |
-  PostfixExpression()
+  expr = PostfixExpression()
+  {return expr;}
 |
-  Literal()
+  expr = Literal()
+  {return expr;}
 |
-  <LPAREN>Expression()<RPAREN>
+  <LPAREN> expr = Expression()<RPAREN>
+  {return "("+expr+")";}
 }
 
-void CastExpression() :
-{}
+String CastExpression() :
 {
-  <LPAREN> Type() <RPAREN> UnaryExpression()
+String type;
+String expr;
+}
+{
+  <LPAREN> type = Type() <RPAREN> expr = UnaryExpression()
+  {return "(" + type + ")" + expr;}
 }
 
-void PostfixExpression() :
-{}
+String PostfixExpression() :
+{
+  String expr;
+  Token operator = null;
+}
 {
-  PrimaryExpression() [ <INCR> | <DECR> ]
+  expr = PrimaryExpression() [ operator = <INCR> | operator = <DECR> ]
+  {
+    if (operator == null) {
+      return expr;
+    }
+    return expr + operator.image;
+  }
 }
 
-void PrimaryExpression() :
-{}
+String PrimaryExpression() :
+{
+  Token identifier;
+  String expr;
+  StringBuffer buff = new StringBuffer();
+}
 {
   LOOKAHEAD(2)
-  <IDENTIFIER> <STATICCLASSACCESS> ClassIdentifier() (PrimarySuffix())*
+  identifier = <IDENTIFIER> <STATICCLASSACCESS> expr = ClassIdentifier()
+  {buff.append(identifier.image).append("::").append(expr);}
+  (
+  expr = PrimarySuffix()
+  {buff.append(expr);}
+  )*
+  {return buff.toString();}
 |
-  PrimaryPrefix() ( PrimarySuffix() )*
+  expr = PrimaryPrefix()
+  {buff.append(expr);}
+  (
+  expr = PrimarySuffix()
+  {buff.append(expr);}
+  )*
+  {return buff.toString();}
 |
-  <ARRAY> ArrayInitializer()
+  <ARRAY> expr = ArrayInitializer()
+  {return "array" + expr;}
 }
 
-void PrimaryPrefix() :
-{}
+String PrimaryPrefix() :
 {
-  <IDENTIFIER>
+  String expr;
+  Token token = null;
+}
+{
+  token = <IDENTIFIER>
+  {return token.image;}
 |
-  [<BIT_AND>] <NEW> ClassIdentifier()
+  [token = <BIT_AND>] <NEW> expr = ClassIdentifier()
+  {
+    if (token == null) {
+      return "new " + expr;
+    }
+    return "new " + expr;
+  }
 |  
-  VariableDeclaratorId()
+  expr = VariableDeclaratorId()
+  {return expr;}
 }
 
-void ClassIdentifier():
-{}
+String ClassIdentifier():
 {
-  <IDENTIFIER>
+  String expr;
+  Token token;
+}
+{
+  token = <IDENTIFIER>
+  {return token.image;}
 |
-  VariableDeclaratorId()
+  expr = VariableDeclaratorId()
+  {return expr;}
 }
 
-void PrimarySuffix() :
-{}
+String PrimarySuffix() :
 {
-  Arguments()
+  String expr;
+}
+{
+  expr = Arguments()
+  {return expr;}
 |
-  VariableSuffix()
+  expr = VariableSuffix()
+  {return expr;}
 }
 
-void VariableSuffix() :
-{}
+String VariableSuffix() :
 {
-  <CLASSACCESS> VariableName()
+  String expr = null;
+}
+{
+  <CLASSACCESS> expr = VariableName()
+  {return "->" + expr;}
 | 
-  <LBRACKET> [ Expression() ] <RBRACKET>
+  <LBRACKET> [ expr = Expression() ] <RBRACKET>
+  {
+    if(expr == null) {
+      return "[]";
+    }
+    return "[" + expr + "]";
+  }
 }
 
-void Literal() :
-{}
+String Literal() :
 {
-  <INTEGER_LITERAL>
+  String expr;
+  Token token;
+}
+{
+  token = <INTEGER_LITERAL>
+  {return token.image;}
 |
-  <FLOATING_POINT_LITERAL>
+  token = <FLOATING_POINT_LITERAL>
+  {return token.image;}
 |
   try {
-    <STRING_LITERAL>
+    token = <STRING_LITERAL>
+  {return token.image;}
   } catch (TokenMgrError e) {
     errorMessage = "unterminated string";
     errorLevel   = ERROR;
     throw generateParseException();
   }
 |
-  BooleanLiteral()
+  expr = BooleanLiteral()
+  {return expr;}
 |
-  NullLiteral()
+  expr = NullLiteral()
+  {return expr;}
 }
 
-void BooleanLiteral() :
+String BooleanLiteral() :
 {}
 {
   <TRUE>
+  {return "true";}
 |
   <FALSE>
+  {return "false";}
 }
 
-void NullLiteral() :
+String NullLiteral() :
 {}
 {
   <NULL>
+  {return "null";}
 }
 
-void Arguments() :
-{}
+String Arguments() :
 {
-  <LPAREN> [ ArgumentList() ]
+String expr = null;
+}
+{
+  <LPAREN> [ expr = ArgumentList() ]
   try {
     <RPAREN>
   } catch (ParseException e) {
@@ -933,21 +1332,35 @@ void Arguments() :
     errorLevel   = ERROR;
     throw e;
   }
+  {
+  if (expr == null) {
+    return "()";
+  }
+  return "(" + expr + ")";
+  }
 }
 
-void ArgumentList() :
-{}
+String ArgumentList() :
 {
-  Expression()
+String expr;
+StringBuffer buff = new StringBuffer();
+}
+{
+  expr = Expression()
+  {buff.append(expr);}
   ( <COMMA>
       try {
-        Expression()
+        expr = Expression()
       } catch (ParseException e) {
         errorMessage = "expression expected after a comma in argument list";
         errorLevel   = ERROR;
         throw e;
       }
+    {
+      buff.append(",").append("expr");
+    }
    )*
+   {return buff.toString();}
 }
 
 /*
@@ -1013,10 +1426,17 @@ void IncludeStatement() :
   <INCLUDE_ONCE> Expression() (<SEMICOLON> | "?>")
 }
 
-void PrintExpression() :
-{}
+String PrintExpression() :
+{
+  StringBuffer buff = new StringBuffer("print ");
+  String expr;
+}
 {
-  <PRINT> Expression()
+  <PRINT> expr = Expression()
+  {
+    buff.append(expr);
+    return buff.toString();
+  }
 }
 
 void EchoStatement() :