From: kpouer <kpouer>
Date: Fri, 7 Mar 2003 08:36:12 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://secure.phpeclipse.com

*** empty log message ***
---

diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.java b/net.sourceforge.phpeclipse/src/test/PHPParser.java
index 8d922cd..30ecd2f 100644
--- a/net.sourceforge.phpeclipse/src/test/PHPParser.java
+++ b/net.sourceforge.phpeclipse/src/test/PHPParser.java
@@ -278,6 +278,7 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
       case SWITCH:
       case TRUE:
       case WHILE:
+      case FOREACH:
       case INTEGER_LITERAL:
       case FLOATING_POINT_LITERAL:
       case STRING_LITERAL:
@@ -803,6 +804,10 @@ StringBuffer buff = new StringBuffer("(");
       jj_consume_token(INTEGER);
    {if (true) return "integer";}
       break;
+    case OBJECT:
+      jj_consume_token(OBJECT);
+   {if (true) return "object";}
+      break;
     default:
       jj_la1[21] = jj_gen;
       jj_consume_token(-1);
@@ -1909,8 +1914,8 @@ StringBuffer buff = new StringBuffer();
         case SEMICOLON:
           jj_consume_token(SEMICOLON);
           break;
-        case 129:
-          jj_consume_token(129);
+        case 132:
+          jj_consume_token(132);
           break;
         default:
           jj_la1[64] = jj_gen;
@@ -1963,6 +1968,9 @@ StringBuffer buff = new StringBuffer();
       case FOR:
         ForStatement();
         break;
+      case FOREACH:
+        ForeachStatement();
+        break;
       case BREAK:
         BreakStatement();
         break;
@@ -2017,8 +2025,8 @@ StringBuffer buff = new StringBuffer();
         case SEMICOLON:
           jj_consume_token(SEMICOLON);
           break;
-        case 129:
-          jj_consume_token(129);
+        case 132:
+          jj_consume_token(132);
           break;
         default:
           jj_la1[67] = jj_gen;
@@ -2040,8 +2048,8 @@ StringBuffer buff = new StringBuffer();
         case SEMICOLON:
           jj_consume_token(SEMICOLON);
           break;
-        case 129:
-          jj_consume_token(129);
+        case 132:
+          jj_consume_token(132);
           break;
         default:
           jj_la1[68] = jj_gen;
@@ -2063,8 +2071,8 @@ StringBuffer buff = new StringBuffer();
         case SEMICOLON:
           jj_consume_token(SEMICOLON);
           break;
-        case 129:
-          jj_consume_token(129);
+        case 132:
+          jj_consume_token(132);
           break;
         default:
           jj_la1[69] = jj_gen;
@@ -2086,8 +2094,8 @@ StringBuffer buff = new StringBuffer();
         case SEMICOLON:
           jj_consume_token(SEMICOLON);
           break;
-        case 129:
-          jj_consume_token(129);
+        case 132:
+          jj_consume_token(132);
           break;
         default:
           jj_la1[70] = jj_gen;
@@ -2138,8 +2146,8 @@ StringBuffer buff = new StringBuffer();
       case SEMICOLON:
         jj_consume_token(SEMICOLON);
         break;
-      case 129:
-        jj_consume_token(129);
+      case 132:
+        jj_consume_token(132);
         break;
       default:
         jj_la1[73] = jj_gen;
@@ -2174,8 +2182,8 @@ StringBuffer buff = new StringBuffer();
       case SEMICOLON:
         jj_consume_token(SEMICOLON);
         break;
-      case 129:
-        jj_consume_token(129);
+      case 132:
+        jj_consume_token(132);
         break;
       default:
         jj_la1[75] = jj_gen;
@@ -2210,8 +2218,8 @@ StringBuffer buff = new StringBuffer();
       case SEMICOLON:
         jj_consume_token(SEMICOLON);
         break;
-      case 129:
-        jj_consume_token(129);
+      case 132:
+        jj_consume_token(132);
         break;
       default:
         jj_la1[77] = jj_gen;
@@ -2265,6 +2273,7 @@ StringBuffer buff = new StringBuffer();
       case SWITCH:
       case TRUE:
       case WHILE:
+      case FOREACH:
       case INTEGER_LITERAL:
       case FLOATING_POINT_LITERAL:
       case STRING_LITERAL:
@@ -2315,6 +2324,7 @@ StringBuffer buff = new StringBuffer();
     case SWITCH:
     case TRUE:
     case WHILE:
+    case FOREACH:
     case INTEGER_LITERAL:
     case FLOATING_POINT_LITERAL:
     case STRING_LITERAL:
@@ -2482,6 +2492,7 @@ StringBuffer buff = new StringBuffer();
         case SWITCH:
         case TRUE:
         case WHILE:
+        case FOREACH:
         case INTEGER_LITERAL:
         case FLOATING_POINT_LITERAL:
         case STRING_LITERAL:
@@ -2613,6 +2624,7 @@ StringBuffer buff = new StringBuffer();
         case SWITCH:
         case TRUE:
         case WHILE:
+        case FOREACH:
         case INTEGER_LITERAL:
         case FLOATING_POINT_LITERAL:
         case STRING_LITERAL:
@@ -2643,8 +2655,8 @@ StringBuffer buff = new StringBuffer();
         case SEMICOLON:
           jj_consume_token(SEMICOLON);
           break;
-        case 129:
-          jj_consume_token(129);
+        case 132:
+          jj_consume_token(132);
           break;
         default:
           jj_la1[90] = jj_gen;
@@ -2678,6 +2690,7 @@ StringBuffer buff = new StringBuffer();
     case SWITCH:
     case TRUE:
     case WHILE:
+    case FOREACH:
     case INTEGER_LITERAL:
     case FLOATING_POINT_LITERAL:
     case STRING_LITERAL:
@@ -2713,8 +2726,8 @@ StringBuffer buff = new StringBuffer();
       case SEMICOLON:
         jj_consume_token(SEMICOLON);
         break;
-      case 129:
-        jj_consume_token(129);
+      case 132:
+        jj_consume_token(132);
         break;
       default:
         jj_la1[92] = jj_gen;
@@ -2728,6 +2741,25 @@ StringBuffer buff = new StringBuffer();
     }
   }
 
+  static final public void ForeachStatement() throws ParseException {
+    jj_consume_token(FOREACH);
+    jj_consume_token(LPAREN);
+    Variable();
+    jj_consume_token(AS);
+    Variable();
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case ARRAYASSIGN:
+      jj_consume_token(ARRAYASSIGN);
+      Expression();
+      break;
+    default:
+      jj_la1[93] = jj_gen;
+      ;
+    }
+    jj_consume_token(RPAREN);
+    Statement();
+  }
+
   static final public void ForStatement() throws ParseException {
     jj_consume_token(FOR);
     jj_consume_token(LPAREN);
@@ -2742,7 +2774,7 @@ StringBuffer buff = new StringBuffer();
       ForInit();
       break;
     default:
-      jj_la1[93] = jj_gen;
+      jj_la1[94] = jj_gen;
       ;
     }
     jj_consume_token(SEMICOLON);
@@ -2770,7 +2802,7 @@ StringBuffer buff = new StringBuffer();
       Expression();
       break;
     default:
-      jj_la1[94] = jj_gen;
+      jj_la1[95] = jj_gen;
       ;
     }
     jj_consume_token(SEMICOLON);
@@ -2785,7 +2817,7 @@ StringBuffer buff = new StringBuffer();
       ForUpdate();
       break;
     default:
-      jj_la1[95] = jj_gen;
+      jj_la1[96] = jj_gen;
       ;
     }
     jj_consume_token(RPAREN);
@@ -2807,7 +2839,7 @@ StringBuffer buff = new StringBuffer();
         StatementExpressionList();
         break;
       default:
-        jj_la1[96] = jj_gen;
+        jj_la1[97] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2823,7 +2855,7 @@ StringBuffer buff = new StringBuffer();
         ;
         break;
       default:
-        jj_la1[97] = jj_gen;
+        jj_la1[98] = jj_gen;
         break label_32;
       }
       jj_consume_token(COMMA);
@@ -2842,7 +2874,7 @@ StringBuffer buff = new StringBuffer();
       jj_consume_token(IDENTIFIER);
       break;
     default:
-      jj_la1[98] = jj_gen;
+      jj_la1[99] = jj_gen;
       ;
     }
     jj_consume_token(SEMICOLON);
@@ -2855,7 +2887,7 @@ StringBuffer buff = new StringBuffer();
       jj_consume_token(IDENTIFIER);
       break;
     default:
-      jj_la1[99] = jj_gen;
+      jj_la1[100] = jj_gen;
       ;
     }
     jj_consume_token(SEMICOLON);
@@ -2887,7 +2919,7 @@ StringBuffer buff = new StringBuffer();
       Expression();
       break;
     default:
-      jj_la1[100] = jj_gen;
+      jj_la1[101] = jj_gen;
       ;
     }
     jj_consume_token(SEMICOLON);
@@ -2942,24 +2974,12 @@ StringBuffer buff = new StringBuffer();
     return retval;
   }
 
-  static final private boolean jj_3R_102() {
-    if (jj_scan_token(FLOATING_POINT_LITERAL)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_100() {
-    if (jj_scan_token(FLOATING_POINT_LITERAL)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_113() {
+  static final private boolean jj_3R_114() {
     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_120()) jj_scanpos = xsp;
+    if (jj_3R_121()) 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;
@@ -2967,51 +2987,51 @@ StringBuffer buff = new StringBuffer();
   }
 
   static final private boolean jj_3R_38() {
-    if (jj_scan_token(129)) return true;
+    if (jj_scan_token(132)) 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_139() {
     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_127() {
-    if (jj_scan_token(ARRAYASSIGN)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_36()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_131() {
+  static final private boolean jj_3R_132() {
     Token xsp;
     xsp = jj_scanpos;
-    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_3R_141()) {
+    jj_scanpos = xsp;
+    if (jj_3R_142()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_130()) return true;
+    if (jj_3R_131()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
   static final private boolean jj_3R_128() {
-    if (jj_3R_130()) return true;
+    if (jj_scan_token(ARRAYASSIGN)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_36()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_129() {
+    if (jj_3R_131()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_131()) { jj_scanpos = xsp; break; }
+      if (jj_3R_132()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
@@ -3022,7 +3042,7 @@ StringBuffer buff = new StringBuffer();
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_127()) jj_scanpos = xsp;
+    if (jj_3R_128()) jj_scanpos = xsp;
     else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
@@ -3039,30 +3059,24 @@ StringBuffer buff = new StringBuffer();
     return false;
   }
 
-  static final private boolean jj_3R_101() {
+  static final private boolean jj_3R_102() {
     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_92() {
+  static final private boolean jj_3R_93() {
     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_99() {
+  static final private boolean jj_3R_100() {
     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_91() {
-    if (jj_3R_103()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
   static final private boolean jj_3_5() {
     if (jj_3R_36()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -3076,99 +3090,117 @@ StringBuffer buff = new StringBuffer();
     return false;
   }
 
-  static final private boolean jj_3R_135() {
+  static final private boolean jj_3R_136() {
     if (jj_scan_token(TRIPLEEQUAL)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_134() {
+  static final private boolean jj_3R_135() {
     if (jj_scan_token(BANGDOUBLEEQUAL)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_90() {
-    if (jj_scan_token(PLUS)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_101()) {
-    jj_scanpos = xsp;
-    if (jj_3R_102()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_117() {
-    if (jj_3R_55()) return true;
+  static final private boolean jj_3R_92() {
+    if (jj_3R_104()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_133() {
+  static final private boolean jj_3R_134() {
     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_132() {
+  static final private boolean jj_3R_133() {
     if (jj_scan_token(EQ)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_89() {
-    if (jj_scan_token(MINUS)) return true;
+  static final private boolean jj_3R_91() {
+    if (jj_scan_token(PLUS)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_99()) {
+    if (jj_3R_102()) {
     jj_scanpos = xsp;
-    if (jj_3R_100()) return true;
+    if (jj_3R_103()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_129() {
+  static final private boolean jj_3R_118() {
+    if (jj_3R_56()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_130() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_132()) {
-    jj_scanpos = xsp;
     if (jj_3R_133()) {
     jj_scanpos = xsp;
     if (jj_3R_134()) {
     jj_scanpos = xsp;
-    if (jj_3R_135()) return true;
+    if (jj_3R_135()) {
+    jj_scanpos = xsp;
+    if (jj_3R_136()) 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_128()) return true;
+    if (jj_3R_129()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_88() {
-    if (jj_3R_98()) return true;
+  static final private boolean jj_3R_90() {
+    if (jj_scan_token(MINUS)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_100()) {
+    jj_scanpos = xsp;
+    if (jj_3R_101()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_70() {
+  static final private boolean jj_3R_126() {
+    if (jj_3R_129()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_130()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
+    return false;
+  }
+
+  static final private boolean jj_3R_89() {
+    if (jj_3R_99()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_71() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_88()) {
-    jj_scanpos = xsp;
     if (jj_3R_89()) {
     jj_scanpos = xsp;
     if (jj_3R_90()) {
     jj_scanpos = xsp;
     if (jj_3R_91()) {
     jj_scanpos = xsp;
-    if (jj_3R_92()) return true;
+    if (jj_3R_92()) {
+    jj_scanpos = xsp;
+    if (jj_3R_93()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -3177,19 +3209,7 @@ StringBuffer buff = new StringBuffer();
     return false;
   }
 
-  static final private boolean jj_3R_125() {
-    if (jj_3R_128()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_129()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
-    return false;
-  }
-
-  static final private boolean jj_3R_116() {
+  static final private boolean jj_3R_117() {
     if (jj_scan_token(LBRACE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     if (jj_3R_36()) return true;
@@ -3199,7 +3219,7 @@ StringBuffer buff = new StringBuffer();
     return false;
   }
 
-  static final private boolean jj_3R_195() {
+  static final private boolean jj_3R_196() {
     if (jj_scan_token(COMMA)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     if (jj_3R_36()) return true;
@@ -3207,61 +3227,73 @@ StringBuffer buff = new StringBuffer();
     return false;
   }
 
-  static final private boolean jj_3R_194() {
+  static final private boolean jj_3R_195() {
     if (jj_3R_36()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_195()) { jj_scanpos = xsp; break; }
+      if (jj_3R_196()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_65() {
+  static final private boolean jj_3R_66() {
     if (jj_scan_token(DOLLAR_ID)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_117()) jj_scanpos = xsp;
+    if (jj_3R_118()) jj_scanpos = xsp;
     else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_64() {
-    if (jj_scan_token(DOLLAR)) return true;
+  static final private boolean jj_3R_127() {
+    if (jj_scan_token(BIT_AND)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_55()) return true;
+    if (jj_3R_126()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_126() {
-    if (jj_scan_token(BIT_AND)) return true;
+  static final private boolean jj_3R_65() {
+    if (jj_scan_token(DOLLAR)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_125()) return true;
+    if (jj_3R_56()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_193() {
-    if (jj_3R_194()) return true;
+  static final private boolean jj_3R_194() {
+    if (jj_3R_195()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_63() {
+  static final private boolean jj_3R_122() {
+    if (jj_3R_126()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_127()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
+    return false;
+  }
+
+  static final private boolean jj_3R_64() {
     if (jj_scan_token(IDENTIFIER)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_116()) jj_scanpos = xsp;
+    if (jj_3R_117()) jj_scanpos = xsp;
     else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_97() {
+  static final private boolean jj_3R_98() {
     if (jj_scan_token(LBRACE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     if (jj_3R_36()) return true;
@@ -3271,19 +3303,7 @@ StringBuffer buff = new StringBuffer();
     return false;
   }
 
-  static final private boolean jj_3R_121() {
-    if (jj_3R_125()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_126()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
-    return false;
-  }
-
-  static final private boolean jj_3R_62() {
+  static final private boolean jj_3R_63() {
     if (jj_scan_token(LBRACE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     if (jj_3R_36()) return true;
@@ -3293,16 +3313,16 @@ StringBuffer buff = new StringBuffer();
     return false;
   }
 
-  static final private boolean jj_3R_55() {
+  static final private boolean jj_3R_56() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_62()) {
-    jj_scanpos = xsp;
     if (jj_3R_63()) {
     jj_scanpos = xsp;
     if (jj_3R_64()) {
     jj_scanpos = xsp;
-    if (jj_3R_65()) return true;
+    if (jj_3R_65()) {
+    jj_scanpos = xsp;
+    if (jj_3R_66()) 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;
@@ -3310,97 +3330,97 @@ StringBuffer buff = new StringBuffer();
     return false;
   }
 
-  static final private boolean jj_3R_191() {
+  static final private boolean jj_3R_192() {
     if (jj_scan_token(LPAREN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_193()) jj_scanpos = xsp;
+    if (jj_3R_194()) jj_scanpos = xsp;
     else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     if (jj_scan_token(RPAREN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_87() {
+  static final private boolean jj_3R_88() {
     if (jj_scan_token(DOLLAR)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_55()) return true;
+    if (jj_3R_56()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_122() {
+  static final private boolean jj_3R_123() {
     if (jj_scan_token(XOR)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_121()) return true;
+    if (jj_3R_122()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_119() {
+  static final private boolean jj_3R_120() {
     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_86() {
-    if (jj_scan_token(DOLLAR_ID)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_97()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_69() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_86()) {
-    jj_scanpos = xsp;
-    if (jj_3R_87()) return true;
+  static final private boolean jj_3_7() {
+    if (jj_3R_40()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_114() {
-    if (jj_3R_121()) return true;
+  static final private boolean jj_3R_115() {
+    if (jj_3R_122()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_122()) { jj_scanpos = xsp; break; }
+      if (jj_3R_123()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_124() {
-    if (jj_scan_token(FALSE)) return true;
+  static final private boolean jj_3R_87() {
+    if (jj_scan_token(DOLLAR_ID)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_98()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3_7() {
-    if (jj_3R_40()) return true;
+  static final private boolean jj_3R_70() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_87()) {
+    jj_scanpos = xsp;
+    if (jj_3R_88()) 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_118() {
+  static final private boolean jj_3R_125() {
+    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_119() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_123()) {
+    if (jj_3R_124()) {
     jj_scanpos = xsp;
-    if (jj_3R_124()) return true;
+    if (jj_3R_125()) 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_123() {
+  static final private boolean jj_3R_124() {
     if (jj_scan_token(TRUE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
@@ -3412,20 +3432,34 @@ StringBuffer buff = new StringBuffer();
     return false;
   }
 
+  static final private boolean jj_3R_113() {
+    if (jj_3R_120()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
   static final private boolean jj_3R_112() {
     if (jj_3R_119()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
+  static final private boolean jj_3R_116() {
+    if (jj_scan_token(BIT_OR)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_115()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
   static final private boolean jj_3R_111() {
-    if (jj_3R_118()) return true;
+    if (jj_scan_token(STRING_LITERAL)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_60() {
-    if (jj_3R_69()) return true;
+  static final private boolean jj_3R_61() {
+    if (jj_3R_70()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
@@ -3436,50 +3470,36 @@ StringBuffer buff = new StringBuffer();
     return false;
   }
 
-  static final private boolean jj_3R_115() {
-    if (jj_scan_token(BIT_OR)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_114()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_110() {
-    if (jj_scan_token(STRING_LITERAL)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_104() {
-    if (jj_3R_114()) return true;
+  static final private boolean jj_3R_105() {
+    if (jj_3R_115()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_115()) { jj_scanpos = xsp; break; }
+      if (jj_3R_116()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_109() {
+  static final private boolean jj_3R_110() {
     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_98() {
+  static final private boolean jj_3R_99() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_108()) {
-    jj_scanpos = xsp;
     if (jj_3R_109()) {
     jj_scanpos = xsp;
     if (jj_3R_110()) {
     jj_scanpos = xsp;
     if (jj_3R_111()) {
     jj_scanpos = xsp;
-    if (jj_3R_112()) return true;
+    if (jj_3R_112()) {
+    jj_scanpos = xsp;
+    if (jj_3R_113()) 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;
@@ -3488,57 +3508,57 @@ StringBuffer buff = new StringBuffer();
     return false;
   }
 
-  static final private boolean jj_3R_108() {
+  static final private boolean jj_3R_109() {
     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_56() {
+  static final private boolean jj_3R_57() {
     if (jj_3R_36()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_61() {
-    if (jj_scan_token(ASSIGN)) return true;
+  static final private boolean jj_3R_106() {
+    if (jj_scan_token(DOT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_70()) return true;
+    if (jj_3R_105()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_105() {
-    if (jj_scan_token(DOT)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_104()) return true;
+  static final private boolean jj_3R_108() {
+    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_107() {
-    if (jj_scan_token(_ANDL)) return true;
+  static final private boolean jj_3R_62() {
+    if (jj_scan_token(ASSIGN)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_71()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_53() {
-    if (jj_3R_60()) return true;
+  static final private boolean jj_3R_54() {
+    if (jj_3R_61()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_61()) jj_scanpos = xsp;
+    if (jj_3R_62()) jj_scanpos = xsp;
     else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_93() {
-    if (jj_3R_104()) return true;
+  static final private boolean jj_3R_94() {
+    if (jj_3R_105()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_105()) { jj_scanpos = xsp; break; }
+      if (jj_3R_106()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
@@ -3549,7 +3569,7 @@ StringBuffer buff = new StringBuffer();
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_56()) jj_scanpos = xsp;
+    if (jj_3R_57()) 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;
@@ -3559,7 +3579,7 @@ StringBuffer buff = new StringBuffer();
   static final private boolean jj_3R_41() {
     if (jj_scan_token(CLASSACCESS)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_55()) return true;
+    if (jj_3R_56()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
@@ -3575,265 +3595,265 @@ StringBuffer buff = new StringBuffer();
     return false;
   }
 
-  static final private boolean jj_3R_188() {
+  static final private boolean jj_3R_189() {
     if (jj_3R_33()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_187() {
-    if (jj_3R_191()) return true;
+  static final private boolean jj_3R_188() {
+    if (jj_3R_192()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_185() {
+  static final private boolean jj_3R_186() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_187()) {
+    if (jj_3R_188()) {
     jj_scanpos = xsp;
-    if (jj_3R_188()) return true;
+    if (jj_3R_189()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_106() {
+  static final private boolean jj_3R_107() {
     if (jj_scan_token(SC_AND)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_96() {
-    if (jj_scan_token(_ORL)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_94() {
+  static final private boolean jj_3R_95() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_106()) {
+    if (jj_3R_107()) {
     jj_scanpos = xsp;
-    if (jj_3R_107()) return true;
+    if (jj_3R_108()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_93()) return true;
+    if (jj_3R_94()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_71() {
-    if (jj_3R_93()) return true;
+  static final private boolean jj_3R_97() {
+    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_72() {
+    if (jj_3R_94()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_94()) { jj_scanpos = xsp; break; }
+      if (jj_3R_95()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_190() {
-    if (jj_3R_60()) return true;
+  static final private boolean jj_3R_191() {
+    if (jj_3R_61()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_189() {
+  static final private boolean jj_3R_190() {
     if (jj_scan_token(IDENTIFIER)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_186() {
+  static final private boolean jj_3R_187() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_189()) {
+    if (jj_3R_190()) {
     jj_scanpos = xsp;
-    if (jj_3R_190()) return true;
+    if (jj_3R_191()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_67() {
+  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_36()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     if (jj_scan_token(COLON)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_58()) return true;
+    if (jj_3R_59()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_181() {
-    if (jj_3R_60()) return true;
+  static final private boolean jj_3R_182() {
+    if (jj_3R_61()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_95() {
+  static final private boolean jj_3R_96() {
     if (jj_scan_token(SC_OR)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_72() {
+  static final private boolean jj_3R_73() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_95()) {
+    if (jj_3R_96()) {
     jj_scanpos = xsp;
-    if (jj_3R_96()) return true;
+    if (jj_3R_97()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_71()) return true;
+    if (jj_3R_72()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_180() {
+  static final private boolean jj_3R_181() {
     if (jj_scan_token(NEW)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_186()) return true;
+    if (jj_3R_187()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_183() {
+  static final private boolean jj_3R_184() {
     if (jj_scan_token(DECR)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_179() {
+  static final private boolean jj_3R_180() {
     if (jj_scan_token(IDENTIFIER)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_177() {
+  static final private boolean jj_3R_178() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_179()) {
-    jj_scanpos = xsp;
     if (jj_3R_180()) {
     jj_scanpos = xsp;
-    if (jj_3R_181()) return true;
+    if (jj_3R_181()) {
+    jj_scanpos = xsp;
+    if (jj_3R_182()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_66() {
-    if (jj_3R_71()) return true;
+  static final private boolean jj_3R_67() {
+    if (jj_3R_72()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_72()) { jj_scanpos = xsp; break; }
+      if (jj_3R_73()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_103() {
+  static final private boolean jj_3R_104() {
     if (jj_scan_token(ARRAY)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_113()) return true;
+    if (jj_3R_114()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_58() {
-    if (jj_3R_66()) 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;
     xsp = jj_scanpos;
-    if (jj_3R_67()) jj_scanpos = xsp;
+    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_182() {
+  static final private boolean jj_3R_183() {
     if (jj_scan_token(INCR)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_178() {
+  static final private boolean jj_3R_179() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_182()) {
+    if (jj_3R_183()) {
     jj_scanpos = xsp;
-    if (jj_3R_183()) return true;
+    if (jj_3R_184()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_176() {
-    if (jj_3R_103()) return true;
+  static final private boolean jj_3R_177() {
+    if (jj_3R_104()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_184() {
-    if (jj_3R_185()) return true;
+  static final private boolean jj_3R_185() {
+    if (jj_3R_186()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_54() {
+  static final private boolean jj_3R_55() {
     if (jj_scan_token(COMMA)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_53()) return true;
+    if (jj_3R_54()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_175() {
-    if (jj_3R_177()) return true;
+  static final private boolean jj_3R_176() {
+    if (jj_3R_178()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_184()) { jj_scanpos = xsp; break; }
+      if (jj_3R_185()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_192() {
-    if (jj_3R_185()) return true;
+  static final private boolean jj_3R_193() {
+    if (jj_3R_186()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_85() {
+  static final private boolean jj_3R_86() {
     if (jj_scan_token(TILDEEQUAL)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_84() {
+  static final private boolean jj_3R_85() {
     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_172() {
+  static final private boolean jj_3R_173() {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_4()) {
     jj_scanpos = xsp;
-    if (jj_3R_175()) {
+    if (jj_3R_176()) {
     jj_scanpos = xsp;
-    if (jj_3R_176()) return true;
+    if (jj_3R_177()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -3845,110 +3865,108 @@ StringBuffer buff = new StringBuffer();
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     if (jj_scan_token(STATICCLASSACCESS)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_186()) return true;
+    if (jj_3R_187()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_192()) { jj_scanpos = xsp; break; }
+      if (jj_3R_193()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_83() {
+  static final private boolean jj_3R_84() {
     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_82() {
+  static final private boolean jj_3R_83() {
     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_81() {
+  static final private boolean jj_3R_82() {
     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_80() {
+  static final private boolean jj_3R_81() {
     if (jj_scan_token(RSIGNEDSHIFTASSIGN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_79() {
+  static final private boolean jj_3R_80() {
     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_78() {
+  static final private boolean jj_3R_79() {
     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_77() {
-    if (jj_scan_token(PLUSASSIGN)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
   static final private boolean jj_3R_40() {
-    if (jj_3R_53()) return true;
+    if (jj_3R_54()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_54()) { jj_scanpos = xsp; break; }
+      if (jj_3R_55()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_76() {
+  static final private boolean jj_3R_78() {
+    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_77() {
     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_174() {
-    if (jj_3R_172()) return true;
+  static final private boolean jj_3R_175() {
+    if (jj_3R_173()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_178()) jj_scanpos = xsp;
+    if (jj_3R_179()) jj_scanpos = xsp;
     else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_75() {
+  static final private boolean jj_3R_76() {
     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_74() {
+  static final private boolean jj_3R_75() {
     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_73() {
+  static final private boolean jj_3R_74() {
     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_68() {
+  static final private boolean jj_3R_69() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_73()) {
-    jj_scanpos = xsp;
     if (jj_3R_74()) {
     jj_scanpos = xsp;
     if (jj_3R_75()) {
@@ -3971,7 +3989,9 @@ StringBuffer buff = new StringBuffer();
     jj_scanpos = xsp;
     if (jj_3R_84()) {
     jj_scanpos = xsp;
-    if (jj_3R_85()) return true;
+    if (jj_3R_85()) {
+    jj_scanpos = xsp;
+    if (jj_3R_86()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -3988,14 +4008,14 @@ StringBuffer buff = new StringBuffer();
     return false;
   }
 
-  static final private boolean jj_3R_173() {
+  static final private boolean jj_3R_174() {
     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;
-    if (jj_3R_147()) return true;
+    if (jj_3R_148()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
@@ -4010,7 +4030,7 @@ StringBuffer buff = new StringBuffer();
     return false;
   }
 
-  static final private boolean jj_3R_171() {
+  static final private boolean jj_3R_172() {
     if (jj_scan_token(LPAREN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     if (jj_3R_36()) return true;
@@ -4020,26 +4040,20 @@ StringBuffer buff = new StringBuffer();
     return false;
   }
 
-  static final private boolean jj_3R_170() {
-    if (jj_3R_98()) return true;
+  static final private boolean jj_3R_171() {
+    if (jj_3R_99()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_59() {
-    if (jj_3R_68()) return true;
+  static final private boolean jj_3R_60() {
+    if (jj_3R_69()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     if (jj_3R_36()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_169() {
-    if (jj_3R_174()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
   static final private boolean jj_3R_39() {
     if (jj_scan_token(IDENTIFIER)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -4048,18 +4062,24 @@ StringBuffer buff = new StringBuffer();
     return false;
   }
 
-  static final private boolean jj_3R_52() {
-    if (jj_3R_58()) return true;
+  static final private boolean jj_3R_170() {
+    if (jj_3R_175()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_53() {
+    if (jj_3R_59()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_59()) jj_scanpos = xsp;
+    if (jj_3R_60()) jj_scanpos = xsp;
     else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_168() {
-    if (jj_3R_173()) return true;
+  static final private boolean jj_3R_169() {
+    if (jj_3R_174()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
@@ -4067,32 +4087,32 @@ StringBuffer buff = new StringBuffer();
   static final private boolean jj_3R_36() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_51()) {
+    if (jj_3R_52()) {
     jj_scanpos = xsp;
-    if (jj_3R_52()) return true;
+    if (jj_3R_53()) 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_51() {
-    if (jj_3R_57()) return true;
+  static final private boolean jj_3R_52() {
+    if (jj_3R_58()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_166() {
+  static final private boolean jj_3R_167() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_167()) {
-    jj_scanpos = xsp;
     if (jj_3R_168()) {
     jj_scanpos = xsp;
     if (jj_3R_169()) {
     jj_scanpos = xsp;
     if (jj_3R_170()) {
     jj_scanpos = xsp;
-    if (jj_3R_171()) return true;
+    if (jj_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;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -4101,24 +4121,30 @@ StringBuffer buff = new StringBuffer();
     return false;
   }
 
-  static final private boolean jj_3R_167() {
+  static final private boolean jj_3R_168() {
     if (jj_scan_token(BANG)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_147()) return true;
+    if (jj_3R_148()) 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(INTEGER)) return true;
+  static final private boolean jj_3R_51() {
+    if (jj_scan_token(OBJECT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_165() {
+  static final private boolean jj_3R_166() {
     if (jj_scan_token(DECR)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_172()) return true;
+    if (jj_3R_173()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_50() {
+    if (jj_scan_token(INTEGER)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
@@ -4135,22 +4161,22 @@ StringBuffer buff = new StringBuffer();
     return false;
   }
 
-  static final private boolean jj_3R_47() {
-    if (jj_scan_token(DOUBLE)) return true;
+  static final private boolean jj_3R_165() {
+    if (jj_scan_token(INCR)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_173()) 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(INCR)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_172()) return true;
+    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_163() {
-    if (jj_scan_token(MINUS)) return true;
+  static final private boolean jj_3R_47() {
+    if (jj_scan_token(DOUBLE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
@@ -4167,6 +4193,12 @@ StringBuffer buff = new StringBuffer();
     return false;
   }
 
+  static final private boolean jj_3R_162() {
+    if (jj_3R_167()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
   static final private boolean jj_3R_44() {
     if (jj_scan_token(BOOL)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -4196,7 +4228,9 @@ StringBuffer buff = new StringBuffer();
     jj_scanpos = xsp;
     if (jj_3R_49()) {
     jj_scanpos = xsp;
-    if (jj_3R_50()) return true;
+    if (jj_3R_50()) {
+    jj_scanpos = xsp;
+    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;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -4205,6 +4239,7 @@ StringBuffer buff = new StringBuffer();
     } 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;
   }
 
@@ -4214,40 +4249,34 @@ StringBuffer buff = new StringBuffer();
     return false;
   }
 
-  static final private boolean jj_3R_160() {
-    if (jj_3R_165()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_155() {
+  static final private boolean jj_3R_156() {
     if (jj_scan_token(REM)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_159() {
-    if (jj_3R_164()) return true;
+  static final private boolean jj_3R_160() {
+    if (jj_3R_165()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_162() {
+  static final private boolean jj_3R_163() {
     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_156() {
+  static final private boolean jj_3R_157() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_158()) {
-    jj_scanpos = xsp;
     if (jj_3R_159()) {
     jj_scanpos = xsp;
     if (jj_3R_160()) {
     jj_scanpos = xsp;
-    if (jj_3R_161()) return true;
+    if (jj_3R_161()) {
+    jj_scanpos = xsp;
+    if (jj_3R_162()) 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;
@@ -4255,20 +4284,20 @@ StringBuffer buff = new StringBuffer();
     return false;
   }
 
-  static final private boolean jj_3R_158() {
+  static final private boolean jj_3R_159() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_162()) {
+    if (jj_3R_163()) {
     jj_scanpos = xsp;
-    if (jj_3R_163()) return true;
+    if (jj_3R_164()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_147()) return true;
+    if (jj_3R_148()) 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_58() {
     if (jj_scan_token(PRINT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     if (jj_3R_36()) return true;
@@ -4276,204 +4305,216 @@ StringBuffer buff = new StringBuffer();
     return false;
   }
 
-  static final private boolean jj_3R_157() {
+  static final private boolean jj_3R_158() {
     if (jj_scan_token(AT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_152() {
+  static final private boolean jj_3R_153() {
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_157()) { jj_scanpos = xsp; break; }
+      if (jj_3R_158()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
-    if (jj_3R_156()) return true;
+    if (jj_3R_157()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_154() {
+  static final private boolean jj_3R_155() {
     if (jj_scan_token(SLASH)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_147() {
+  static final private boolean jj_3R_148() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_151()) {
+    if (jj_3R_152()) {
     jj_scanpos = xsp;
-    if (jj_3R_152()) return true;
+    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;
     return false;
   }
 
-  static final private boolean jj_3R_151() {
+  static final private boolean jj_3R_152() {
     if (jj_scan_token(BIT_AND)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_156()) return true;
+    if (jj_3R_157()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_146() {
+  static final private boolean jj_3R_147() {
     if (jj_scan_token(RUNSIGNEDSHIFT)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_150() {
+  static final private boolean jj_3R_151() {
     if (jj_scan_token(MINUS)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_153() {
+  static final private boolean jj_3R_154() {
     if (jj_scan_token(STAR)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_148() {
+  static final private boolean jj_3R_149() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_153()) {
-    jj_scanpos = xsp;
     if (jj_3R_154()) {
     jj_scanpos = xsp;
-    if (jj_3R_155()) return true;
+    if (jj_3R_155()) {
+    jj_scanpos = xsp;
+    if (jj_3R_156()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_147()) return true;
+    if (jj_3R_148()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_141() {
+  static final private boolean jj_3R_142() {
     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_142() {
-    if (jj_3R_147()) return true;
+  static final private boolean jj_3R_143() {
+    if (jj_3R_148()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_148()) { jj_scanpos = xsp; break; }
+      if (jj_3R_149()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3R_145() {
+  static final private boolean jj_3R_146() {
     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_149() {
+  static final private boolean jj_3R_150() {
     if (jj_scan_token(PLUS)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_143() {
+  static final private boolean jj_3R_144() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_149()) {
+    if (jj_3R_150()) {
     jj_scanpos = xsp;
-    if (jj_3R_150()) return true;
+    if (jj_3R_151()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_142()) return true;
+    if (jj_3R_143()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_140() {
+  static final private boolean jj_3R_141() {
     if (jj_scan_token(LE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_136() {
-    if (jj_3R_142()) return true;
+  static final private boolean jj_3R_137() {
+    if (jj_3R_143()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_143()) { jj_scanpos = xsp; break; }
+      if (jj_3R_144()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  static final private boolean jj_3_2() {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_34()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_144() {
+  static final private boolean jj_3R_145() {
     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_120() {
+  static final private boolean jj_3_2() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     if (jj_3R_34()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    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_137() {
+  static final private boolean jj_3R_138() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_144()) {
-    jj_scanpos = xsp;
     if (jj_3R_145()) {
     jj_scanpos = xsp;
-    if (jj_3R_146()) return true;
+    if (jj_3R_146()) {
+    jj_scanpos = xsp;
+    if (jj_3R_147()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_136()) return true;
+    if (jj_3R_137()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_139() {
+  static final private boolean jj_3R_140() {
     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_130() {
-    if (jj_3R_136()) return true;
+  static final private boolean jj_3R_121() {
+    if (jj_3R_34()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_2()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
+    return false;
+  }
+
+  static final private boolean jj_3R_131() {
+    if (jj_3R_137()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_137()) { jj_scanpos = xsp; break; }
+      if (jj_3R_138()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
+  static final private boolean jj_3R_103() {
+    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_101() {
+    if (jj_scan_token(FLOATING_POINT_LITERAL)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
   static private boolean jj_initialized_once = false;
   static public PHPParserTokenManager token_source;
   static SimpleCharStream jj_input_stream;
@@ -4484,7 +4525,7 @@ StringBuffer buff = new StringBuffer();
   static public boolean lookingAhead = false;
   static private boolean jj_semLA;
   static private int jj_gen;
-  static final private int[] jj_la1 = new int[101];
+  static final private int[] jj_la1 = new int[102];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static private int[] jj_la1_2;
@@ -4498,19 +4539,19 @@ StringBuffer buff = new StringBuffer();
       jj_la1_4();
    }
    private static void jj_la1_0() {
-      jj_la1_0 = new int[] {0x2,0x7fcb0000,0x0,0x60000,0x60000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0xc00000,0x0,0x0,0x0,0x0,0x0,0x0,0xc00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0x400000,0x0,0x400000,0x0,0x0,0x80000000,0x80000000,0x400000,0x0,0x0,0x80000000,0xc00000,0x80000000,0x0,0x0,0xc00000,0x0,0x0,0x0,0x7f480000,0x0,0x0,0x0,0x0,0x1e000000,0x0,0x0,0x0,0x0,0x0,0x0,0x7fcb0000,0x7fcb0000,0x0,0x0,0x0,0x400000,0x0,0x7fcb0000,0x0,0x100000,0x200000,0x7fc80000,0x0,0x7fc80000,0x0,0x400000,0xc00000,0x400000,0x400000,0x0,0x0,0x0,0xc00000,};
+      jj_la1_0 = new int[] {0x2,0xff960000,0x0,0xc0000,0xc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x1800000,0x0,0x0,0x0,0x0,0x0,0x0,0x1800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x800000,0x0,0x800000,0x0,0x0,0x0,0x0,0x800000,0x0,0x0,0x0,0x1800000,0x0,0x0,0x0,0x1800000,0x0,0x0,0x0,0xfe900000,0x0,0x0,0x0,0x0,0x3c000000,0x0,0x0,0x0,0x0,0x0,0x0,0xff960000,0xff960000,0x0,0x0,0x0,0x800000,0x0,0xff960000,0x0,0x200000,0x400000,0xff900000,0x0,0xff900000,0x0,0x0,0x800000,0x1800000,0x800000,0x800000,0x0,0x0,0x0,0x1800000,};
    }
    private static void jj_la1_1() {
-      jj_la1_1 = new int[] {0x0,0xd76a4,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x42200,0x2,0x43200,0x0,0x0,0x0,0x0,0x3fa00000,0x0,0x43200,0x0,0x0,0x40000000,0x40000000,0x80000000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x43200,0x0,0x43200,0x0,0x43200,0x0,0x0,0x0,0x0,0x1000,0x1000,0x0,0x0,0x43200,0x0,0x42200,0x40200,0x43200,0x0,0x0,0x0,0x954a4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xd76a4,0xd76a4,0x0,0x0,0x0,0x1000,0x48,0xd76a4,0x48,0x0,0x0,0xd76a4,0x0,0xd76a4,0x0,0x1000,0x43200,0x1000,0x1000,0x0,0x0,0x0,0x43200,};
+      jj_la1_1 = new int[] {0x0,0x5aed48,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x84400,0x4,0x86400,0x0,0x0,0x0,0x0,0xff000000,0x0,0x86400,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x86400,0x0,0x86400,0x0,0x86400,0x0,0x0,0x1,0x1,0x2000,0x2000,0x0,0x1,0x86400,0x1,0x84400,0x80400,0x86400,0x0,0x0,0x0,0x52a948,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x5aed48,0x5aed48,0x0,0x0,0x0,0x2000,0x90,0x5aed48,0x90,0x0,0x0,0x5aed48,0x0,0x5aed48,0x0,0x4,0x2000,0x86400,0x2000,0x2000,0x0,0x0,0x0,0x86400,};
    }
    private static void jj_la1_2() {
-      jj_la1_2 = new int[] {0x0,0x11914451,0x0,0x0,0x0,0x200000,0x2000000,0x10000,0x1000000,0x10000,0x1010400,0x1010400,0x11,0x11,0x451,0x0,0x11804451,0x0,0x200000,0x1000000,0x0,0x0,0x2000000,0x11804451,0x2000000,0x20000000,0x0,0x0,0x0,0x0,0x400000,0x0,0x0,0x0,0x80000000,0x80000000,0xc000000,0xc000000,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x11804451,0x0,0x11004451,0x10000000,0x1004451,0x0,0x0,0x44000,0x44000,0x1000400,0x1000400,0x1000400,0x44000,0x11804451,0x40000,0x51,0x0,0x11804451,0x200000,0x100000,0x800000,0x1910400,0x100000,0x100000,0x100000,0x100000,0x0,0x200000,0x100000,0x200000,0x100000,0x200000,0x100000,0x11914451,0x11914451,0x200000,0x2000000,0x2000000,0x1000400,0x0,0x11914451,0x0,0x0,0x0,0x11914451,0x100000,0x51914451,0x100000,0x1000400,0x11804451,0x1000400,0x1000400,0x200000,0x400,0x400,0x11804451,};
+      jj_la1_2 = new int[] {0x0,0x8c8a2288,0x0,0x0,0x0,0x1000000,0x10000000,0x80000,0x8000000,0x80000,0x8082000,0x8082000,0x88,0x88,0x2288,0x0,0x8c022288,0x0,0x1000000,0x8000000,0x0,0x1,0x10000000,0x8c022288,0x10000000,0x0,0x2,0x2,0x4,0x4,0x2000000,0x0,0x0,0x0,0x0,0x0,0x60000000,0x60000000,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x8c022288,0x0,0x88022288,0x80000000,0x8022288,0x0,0x0,0x220000,0x220000,0x8002000,0x8002000,0x8002000,0x220000,0x8c022288,0x200000,0x288,0x0,0x8c022288,0x1000000,0x800000,0x4000000,0xc882000,0x800000,0x800000,0x800000,0x800000,0x0,0x1000000,0x800000,0x1000000,0x800000,0x1000000,0x800000,0x8c8a2288,0x8c8a2288,0x1000000,0x10000000,0x10000000,0x8002000,0x0,0x8c8a2288,0x0,0x0,0x0,0x8c8a2288,0x800000,0x8c8a2288,0x800000,0x0,0x8002000,0x8c022288,0x8002000,0x8002000,0x1000000,0x2000,0x2000,0x8c022288,};
    }
    private static void jj_la1_3() {
-      jj_la1_3 = new int[] {0x0,0x9e0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x0,0x9e0,0x800,0x0,0x800,0x800,0x0,0x9ffc0000,0x9e0,0x9ffc0000,0x0,0x8,0x8,0x10,0x10,0x0,0x1000,0x2000,0x800,0x60000004,0x60000004,0x3,0x3,0x38000,0x38000,0x180,0x180,0x4600,0x4600,0x0,0x9e0,0x180,0x1e0,0x0,0x0,0x60,0x60,0x0,0x0,0x0,0x0,0x0,0x0,0x9e0,0x0,0x0,0x0,0x9e0,0x0,0x0,0x0,0x60,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x9e0,0x9e0,0x0,0x9ffc0060,0x9ffc0060,0x60,0x0,0x9e0,0x0,0x0,0x0,0x9e0,0x0,0x9e0,0x0,0x60,0x9e0,0x60,0x60,0x0,0x0,0x0,0x9e0,};
+      jj_la1_3 = new int[] {0x0,0x4f00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc00,0x0,0x4f00,0x4000,0x0,0x4000,0x4000,0x0,0xffe00000,0x4f00,0xffe00000,0x1,0x40,0x40,0x80,0x80,0x0,0x8000,0x10000,0x4000,0x24,0x24,0x18,0x18,0x1c0000,0x1c0000,0xc00,0xc00,0x23000,0x23000,0x0,0x4f00,0xc00,0xf00,0x0,0x0,0x300,0x300,0x0,0x0,0x0,0x0,0x0,0x0,0x4f00,0x0,0x0,0x0,0x4f00,0x0,0x0,0x0,0x300,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4f00,0x4f00,0x0,0xffe00300,0xffe00300,0x300,0x0,0x4f00,0x0,0x0,0x0,0x4f00,0x0,0x4f02,0x0,0x0,0x300,0x4f00,0x300,0x300,0x0,0x0,0x0,0x4f00,};
    }
    private static void jj_la1_4() {
-      jj_la1_4 = new int[] {0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0x1,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0x0,0x1,0x0,0x0,0x0,0x0,0x1,0x1,0x1,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x2,0x0,0x1,0x2,0x2,0x2,0x2,0x0,0x0,0x2,0x0,0x2,0x0,0x2,0x1,0x1,0x0,0x0,0x0,0x1,0x0,0x1,0x0,0x0,0x0,0x1,0x2,0x1,0x2,0x1,0x1,0x1,0x1,0x0,0x0,0x0,0x1,};
+      jj_la1_4 = new int[] {0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x8,0x8,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x8,0x0,0x0,0x4,0x8,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3,0x3,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x8,0x0,0x8,0x0,0x0,0x0,0x0,0x8,0x8,0x8,0x0,0x8,0x0,0x0,0x0,0x8,0x0,0x10,0x0,0x8,0x10,0x10,0x10,0x10,0x0,0x0,0x10,0x0,0x10,0x0,0x10,0x8,0x8,0x0,0x4,0x4,0x8,0x0,0x8,0x0,0x0,0x0,0x8,0x10,0x8,0x10,0x0,0x8,0x8,0x8,0x8,0x0,0x0,0x0,0x8,};
    }
   static final private JJCalls[] jj_2_rtns = new JJCalls[7];
   static private boolean jj_rescan = false;
@@ -4529,7 +4570,7 @@ StringBuffer buff = new StringBuffer();
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 101; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 102; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4539,7 +4580,7 @@ StringBuffer buff = new StringBuffer();
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 101; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 102; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4556,7 +4597,7 @@ StringBuffer buff = new StringBuffer();
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 101; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 102; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4566,7 +4607,7 @@ StringBuffer buff = new StringBuffer();
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 101; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 102; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4582,7 +4623,7 @@ StringBuffer buff = new StringBuffer();
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 101; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 102; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4591,7 +4632,7 @@ StringBuffer buff = new StringBuffer();
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 101; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 102; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4698,15 +4739,15 @@ StringBuffer buff = new StringBuffer();
 
   static public ParseException generateParseException() {
     jj_expentries.removeAllElements();
-    boolean[] la1tokens = new boolean[130];
-    for (int i = 0; i < 130; i++) {
+    boolean[] la1tokens = new boolean[133];
+    for (int i = 0; i < 133; i++) {
       la1tokens[i] = false;
     }
     if (jj_kind >= 0) {
       la1tokens[jj_kind] = true;
       jj_kind = -1;
     }
-    for (int i = 0; i < 101; i++) {
+    for (int i = 0; i < 102; i++) {
       if (jj_la1[i] == jj_gen) {
         for (int j = 0; j < 32; j++) {
           if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -4727,7 +4768,7 @@ StringBuffer buff = new StringBuffer();
         }
       }
     }
-    for (int i = 0; i < 130; i++) {
+    for (int i = 0; i < 133; i++) {
       if (la1tokens[i]) {
         jj_expentry = new int[1];
         jj_expentry[0] = i;
diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.jj b/net.sourceforge.phpeclipse/src/test/PHPParser.jj
index 9e3fc1d..46fb115 100644
--- a/net.sourceforge.phpeclipse/src/test/PHPParser.jj
+++ b/net.sourceforge.phpeclipse/src/test/PHPParser.jj
@@ -277,10 +277,14 @@ PARSER_END(PHPParser)
   "/*" : IN_MULTI_LINE_COMMENT
 }
 
-<IN_SINGLE_LINE_COMMENT>
-SPECIAL_TOKEN :
+<IN_SINGLE_LINE_COMMENT> SPECIAL_TOKEN :
 {
-  <SINGLE_LINE_COMMENT: "\n" | "\r" | "\r\n" | "?>" > : PHPPARSING
+  <SINGLE_LINE_COMMENT: "\n" | "\r" | "\r\n" > : PHPPARSING
+}
+
+<IN_SINGLE_LINE_COMMENT> TOKEN :
+{
+  <SINGLE_LINE_COMMENT_PHPEND : "?>" > : DEFAULT
 }
 
 <IN_FORMAL_COMMENT>
@@ -352,6 +356,8 @@ MORE :
 | < TRUE: "true" >
 | < WHILE: "while" >
 | < ENDWHILE : "endwhile" >
+| <FOREACH : "foreach" >
+| <AS : "as" >
 }
 
 /* TYPES */
@@ -870,6 +876,9 @@ String Type() :
 |
   <INTEGER>
   {return "integer";}
+|
+  <OBJECT>
+  {return "object";}
 }
 
 String Expression() :
@@ -1528,6 +1537,8 @@ void Statement() :
 |
   ForStatement()
 |
+  ForeachStatement()
+|
   BreakStatement()
 |
   ContinueStatement()
@@ -1792,6 +1803,12 @@ void DoStatement() :
   }
 }
 
+void ForeachStatement() :
+{}
+{
+  <FOREACH> <LPAREN> Variable() <AS> Variable() [ <ARRAYASSIGN> Expression() ] <RPAREN> Statement()
+}
+
 void ForStatement() :
 {}
 {
diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java b/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java
index ab69d54..1d8793c 100644
--- a/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java
+++ b/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java
@@ -7,121 +7,124 @@ public interface PHPParserConstants {
   int PHPSTART = 1;
   int PHPEND = 2;
   int SINGLE_LINE_COMMENT = 12;
-  int FORMAL_COMMENT = 13;
-  int MULTI_LINE_COMMENT = 14;
-  int CLASS = 16;
-  int FUNCTION = 17;
-  int VAR = 18;
-  int IF = 19;
-  int ELSEIF = 20;
-  int ELSE = 21;
-  int ARRAY = 22;
-  int PRINT = 23;
-  int ECHO = 24;
-  int INCLUDE = 25;
-  int REQUIRE = 26;
-  int INCLUDE_ONCE = 27;
-  int REQUIRE_ONCE = 28;
-  int GLOBAL = 29;
-  int STATIC = 30;
-  int CLASSACCESS = 31;
-  int STATICCLASSACCESS = 32;
-  int ARRAYASSIGN = 33;
-  int BREAK = 34;
-  int CASE = 35;
-  int CONST = 36;
-  int CONTINUE = 37;
-  int _DEFAULT = 38;
-  int DO = 39;
-  int EXTENDS = 40;
-  int FALSE = 41;
-  int FOR = 42;
-  int GOTO = 43;
-  int NEW = 44;
-  int NULL = 45;
-  int RETURN = 46;
-  int SUPER = 47;
-  int SWITCH = 48;
-  int THIS = 49;
-  int TRUE = 50;
-  int WHILE = 51;
-  int ENDWHILE = 52;
-  int STRING = 53;
-  int OBJECT = 54;
-  int BOOL = 55;
-  int BOOLEAN = 56;
-  int REAL = 57;
-  int DOUBLE = 58;
-  int FLOAT = 59;
-  int INT = 60;
-  int INTEGER = 61;
-  int _ORL = 62;
-  int _ANDL = 63;
-  int INTEGER_LITERAL = 64;
-  int DECIMAL_LITERAL = 65;
-  int HEX_LITERAL = 66;
-  int OCTAL_LITERAL = 67;
-  int FLOATING_POINT_LITERAL = 68;
-  int EXPONENT = 69;
-  int STRING_LITERAL = 70;
-  int STRING_1 = 71;
-  int STRING_2 = 72;
-  int STRING_3 = 73;
-  int IDENTIFIER = 74;
-  int LETTER = 75;
-  int DIGIT = 76;
-  int SPECIAL = 77;
-  int LPAREN = 78;
-  int RPAREN = 79;
-  int LBRACE = 80;
-  int RBRACE = 81;
-  int LBRACKET = 82;
-  int RBRACKET = 83;
-  int SEMICOLON = 84;
-  int COMMA = 85;
-  int DOT = 86;
-  int AT = 87;
-  int DOLLAR = 88;
-  int ASSIGN = 89;
-  int GT = 90;
-  int LT = 91;
-  int BANG = 92;
-  int HOOK = 93;
-  int COLON = 94;
-  int EQ = 95;
-  int LE = 96;
-  int GE = 97;
-  int NE = 98;
-  int SC_OR = 99;
-  int SC_AND = 100;
-  int INCR = 101;
-  int DECR = 102;
-  int PLUS = 103;
-  int MINUS = 104;
-  int STAR = 105;
-  int SLASH = 106;
-  int BIT_AND = 107;
-  int BIT_OR = 108;
-  int XOR = 109;
-  int REM = 110;
-  int LSHIFT = 111;
-  int RSIGNEDSHIFT = 112;
-  int RUNSIGNEDSHIFT = 113;
-  int PLUSASSIGN = 114;
-  int MINUSASSIGN = 115;
-  int STARASSIGN = 116;
-  int SLASHASSIGN = 117;
-  int ANDASSIGN = 118;
-  int ORASSIGN = 119;
-  int XORASSIGN = 120;
-  int DOTASSIGN = 121;
-  int REMASSIGN = 122;
-  int LSHIFTASSIGN = 123;
-  int RSIGNEDSHIFTASSIGN = 124;
-  int BANGDOUBLEEQUAL = 125;
-  int TRIPLEEQUAL = 126;
-  int TILDEEQUAL = 127;
-  int DOLLAR_ID = 128;
+  int SINGLE_LINE_COMMENT_PHPEND = 13;
+  int FORMAL_COMMENT = 14;
+  int MULTI_LINE_COMMENT = 15;
+  int CLASS = 17;
+  int FUNCTION = 18;
+  int VAR = 19;
+  int IF = 20;
+  int ELSEIF = 21;
+  int ELSE = 22;
+  int ARRAY = 23;
+  int PRINT = 24;
+  int ECHO = 25;
+  int INCLUDE = 26;
+  int REQUIRE = 27;
+  int INCLUDE_ONCE = 28;
+  int REQUIRE_ONCE = 29;
+  int GLOBAL = 30;
+  int STATIC = 31;
+  int CLASSACCESS = 32;
+  int STATICCLASSACCESS = 33;
+  int ARRAYASSIGN = 34;
+  int BREAK = 35;
+  int CASE = 36;
+  int CONST = 37;
+  int CONTINUE = 38;
+  int _DEFAULT = 39;
+  int DO = 40;
+  int EXTENDS = 41;
+  int FALSE = 42;
+  int FOR = 43;
+  int GOTO = 44;
+  int NEW = 45;
+  int NULL = 46;
+  int RETURN = 47;
+  int SUPER = 48;
+  int SWITCH = 49;
+  int THIS = 50;
+  int TRUE = 51;
+  int WHILE = 52;
+  int ENDWHILE = 53;
+  int FOREACH = 54;
+  int AS = 55;
+  int STRING = 56;
+  int OBJECT = 57;
+  int BOOL = 58;
+  int BOOLEAN = 59;
+  int REAL = 60;
+  int DOUBLE = 61;
+  int FLOAT = 62;
+  int INT = 63;
+  int INTEGER = 64;
+  int _ORL = 65;
+  int _ANDL = 66;
+  int INTEGER_LITERAL = 67;
+  int DECIMAL_LITERAL = 68;
+  int HEX_LITERAL = 69;
+  int OCTAL_LITERAL = 70;
+  int FLOATING_POINT_LITERAL = 71;
+  int EXPONENT = 72;
+  int STRING_LITERAL = 73;
+  int STRING_1 = 74;
+  int STRING_2 = 75;
+  int STRING_3 = 76;
+  int IDENTIFIER = 77;
+  int LETTER = 78;
+  int DIGIT = 79;
+  int SPECIAL = 80;
+  int LPAREN = 81;
+  int RPAREN = 82;
+  int LBRACE = 83;
+  int RBRACE = 84;
+  int LBRACKET = 85;
+  int RBRACKET = 86;
+  int SEMICOLON = 87;
+  int COMMA = 88;
+  int DOT = 89;
+  int AT = 90;
+  int DOLLAR = 91;
+  int ASSIGN = 92;
+  int GT = 93;
+  int LT = 94;
+  int BANG = 95;
+  int HOOK = 96;
+  int COLON = 97;
+  int EQ = 98;
+  int LE = 99;
+  int GE = 100;
+  int NE = 101;
+  int SC_OR = 102;
+  int SC_AND = 103;
+  int INCR = 104;
+  int DECR = 105;
+  int PLUS = 106;
+  int MINUS = 107;
+  int STAR = 108;
+  int SLASH = 109;
+  int BIT_AND = 110;
+  int BIT_OR = 111;
+  int XOR = 112;
+  int REM = 113;
+  int LSHIFT = 114;
+  int RSIGNEDSHIFT = 115;
+  int RUNSIGNEDSHIFT = 116;
+  int PLUSASSIGN = 117;
+  int MINUSASSIGN = 118;
+  int STARASSIGN = 119;
+  int SLASHASSIGN = 120;
+  int ANDASSIGN = 121;
+  int ORASSIGN = 122;
+  int XORASSIGN = 123;
+  int DOTASSIGN = 124;
+  int REMASSIGN = 125;
+  int LSHIFTASSIGN = 126;
+  int RSIGNEDSHIFTASSIGN = 127;
+  int BANGDOUBLEEQUAL = 128;
+  int TRIPLEEQUAL = 129;
+  int TILDEEQUAL = 130;
+  int DOLLAR_ID = 131;
 
   int DEFAULT = 0;
   int PHPPARSING = 1;
@@ -143,9 +146,10 @@ public interface PHPParserConstants {
     "<token of kind 10>",
     "\"/*\"",
     "<SINGLE_LINE_COMMENT>",
+    "\"?>\"",
     "\"*/\"",
     "\"*/\"",
-    "<token of kind 15>",
+    "<token of kind 16>",
     "\"class\"",
     "\"function\"",
     "\"var\"",
@@ -183,6 +187,8 @@ public interface PHPParserConstants {
     "\"true\"",
     "\"while\"",
     "\"endwhile\"",
+    "\"foreach\"",
+    "\"as\"",
     "\"string\"",
     "\"object\"",
     "\"bool\"",
diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java
index 464bc79..f207bee 100644
--- a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java
+++ b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java
@@ -52,7 +52,7 @@ static private final int jjMoveStringLiteralDfa0_0()
    switch(curChar)
    {
       case 63:
-         return jjMoveStringLiteralDfa1_0(0x2L);
+         return jjMoveStringLiteralDfa1_0(0x10L);
       default :
          return jjMoveNfa_0(0, 0);
    }
@@ -67,8 +67,8 @@ static private final int jjMoveStringLiteralDfa1_0(long active2)
    switch(curChar)
    {
       case 62:
-         if ((active2 & 0x2L) != 0L)
-            return jjStopAtPos(1, 129);
+         if ((active2 & 0x10L) != 0L)
+            return jjStopAtPos(1, 132);
          break;
       default :
          break;
@@ -193,7 +193,7 @@ static private final int jjMoveStringLiteralDfa0_4()
    switch(curChar)
    {
       case 42:
-         return jjMoveStringLiteralDfa1_4(0x4000L);
+         return jjMoveStringLiteralDfa1_4(0x8000L);
       default :
          return 1;
    }
@@ -207,23 +207,67 @@ static private final int jjMoveStringLiteralDfa1_4(long active0)
    switch(curChar)
    {
       case 47:
-         if ((active0 & 0x4000L) != 0L)
-            return jjStopAtPos(1, 14);
+         if ((active0 & 0x8000L) != 0L)
+            return jjStopAtPos(1, 15);
          break;
       default :
          return 2;
    }
    return 2;
 }
+private static final int jjStopStringLiteralDfa_2(int pos, long active0)
+{
+   switch (pos)
+   {
+      default :
+         return -1;
+   }
+}
+private static final int jjStartNfa_2(int pos, long active0)
+{
+   return jjMoveNfa_2(jjStopStringLiteralDfa_2(pos, active0), pos + 1);
+}
+static private final int jjStartNfaWithStates_2(int pos, int kind, int state)
+{
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) { return pos + 1; }
+   return jjMoveNfa_2(state, pos + 1);
+}
 static private final int jjMoveStringLiteralDfa0_2()
 {
-   return jjMoveNfa_2(0, 0);
+   switch(curChar)
+   {
+      case 63:
+         return jjMoveStringLiteralDfa1_2(0x2000L);
+      default :
+         return jjMoveNfa_2(0, 0);
+   }
+}
+static private final int jjMoveStringLiteralDfa1_2(long active0)
+{
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_2(0, active0);
+      return 1;
+   }
+   switch(curChar)
+   {
+      case 62:
+         if ((active0 & 0x2000L) != 0L)
+            return jjStopAtPos(1, 13);
+         break;
+      default :
+         break;
+   }
+   return jjStartNfa_2(0, active0);
 }
 static private final int jjMoveNfa_2(int startState, int curPos)
 {
    int[] nextStates;
    int startsAt = 0;
-   jjnewStateCnt = 5;
+   jjnewStateCnt = 3;
    int i = 1;
    jjstateSet[0] = startState;
    int j, kind = 0x7fffffff;
@@ -244,8 +288,6 @@ static private final int jjMoveNfa_2(int startState, int curPos)
                      if (kind > 12)
                         kind = 12;
                   }
-                  else if (curChar == 63)
-                     jjstateSet[jjnewStateCnt++] = 3;
                   if (curChar == 13)
                      jjstateSet[jjnewStateCnt++] = 1;
                   break;
@@ -257,14 +299,6 @@ static private final int jjMoveNfa_2(int startState, int curPos)
                   if (curChar == 13)
                      jjstateSet[jjnewStateCnt++] = 1;
                   break;
-               case 3:
-                  if (curChar == 62)
-                     kind = 12;
-                  break;
-               case 4:
-                  if (curChar == 63)
-                     jjstateSet[jjnewStateCnt++] = 3;
-                  break;
                default : break;
             }
          } while(i != startsAt);
@@ -299,7 +333,7 @@ static private final int jjMoveNfa_2(int startState, int curPos)
          kind = 0x7fffffff;
       }
       ++curPos;
-      if ((i = jjnewStateCnt) == (startsAt = 5 - (jjnewStateCnt = startsAt)))
+      if ((i = jjnewStateCnt) == (startsAt = 3 - (jjnewStateCnt = startsAt)))
          return curPos;
       try { curChar = input_stream.readChar(); }
       catch(java.io.IOException e) { return curPos; }
@@ -310,122 +344,122 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac
    switch (pos)
    {
       case 0:
-         if ((active0 & 0xfffffffc7fff0000L) != 0L)
+         if ((active0 & 0xfffffff8fffe0000L) != 0L || (active1 & 0x7L) != 0L)
          {
-            jjmatchedKind = 74;
+            jjmatchedKind = 77;
             return 14;
          }
-         if ((active0 & 0xa00L) != 0L || (active1 & 0x20040000000000L) != 0L)
+         if ((active0 & 0xa00L) != 0L || (active1 & 0x100200000000000L) != 0L)
             return 2;
-         if ((active1 & 0x1000000L) != 0L)
+         if ((active1 & 0x8000000L) != 0L)
             return 16;
-         if ((active1 & 0x200000000400000L) != 0L)
+         if ((active1 & 0x1000000002000000L) != 0L)
             return 8;
          return -1;
       case 1:
          if ((active0 & 0x800L) != 0L)
             return 0;
-         if ((active0 & 0x4400008000080000L) != 0L)
+         if ((active0 & 0x2080010000100000L) != 0L || (active1 & 0x2L) != 0L)
             return 14;
-         if ((active0 & 0xbbffff7c7ff70000L) != 0L)
+         if ((active0 & 0xdf7ffef8ffee0000L) != 0L || (active1 & 0x5L) != 0L)
          {
             if (jjmatchedPos != 1)
             {
-               jjmatchedKind = 74;
+               jjmatchedKind = 77;
                jjmatchedPos = 1;
             }
             return 14;
          }
          return -1;
       case 2:
-         if ((active0 & 0xb000140000040000L) != 0L)
+         if ((active0 & 0x8040280000080000L) != 0L || (active1 & 0x5L) != 0L)
             return 14;
-         if ((active0 & 0xfffeb7c7ff30000L) != 0L)
+         if ((active0 & 0x7f3fd6f8ffe60000L) != 0L)
          {
             if (jjmatchedPos != 2)
             {
-               jjmatchedKind = 74;
+               jjmatchedKind = 77;
                jjmatchedPos = 2;
             }
             return 14;
          }
          return -1;
       case 3:
-         if ((active0 & 0x2c79c3747ec30000L) != 0L)
+         if ((active0 & 0x1c0c501002600000L) != 0L)
+            return 14;
+         if ((active0 & 0x637386e8fd860000L) != 0L || (active1 & 0x1L) != 0L)
          {
             if (jjmatchedPos != 3)
             {
-               jjmatchedKind = 74;
+               jjmatchedKind = 77;
                jjmatchedPos = 3;
             }
             return 14;
          }
-         if ((active0 & 0x386280801300000L) != 0L)
-            return 14;
          return -1;
       case 4:
-         if ((active0 & 0x808821400c10000L) != 0L)
-            return 14;
-         if ((active0 & 0x257141607e120000L) != 0L)
+         if ((active0 & 0x2b6282c0fc240000L) != 0L || (active1 & 0x1L) != 0L)
          {
-            jjmatchedKind = 74;
+            jjmatchedKind = 77;
             jjmatchedPos = 4;
             return 14;
          }
+         if ((active0 & 0x4011042801820000L) != 0L)
+            return 14;
          return -1;
       case 5:
-         if ((active0 & 0x461400060100000L) != 0L)
+         if ((active0 & 0x23028000c0200000L) != 0L)
             return 14;
-         if ((active0 & 0x211001601e020000L) != 0L)
+         if ((active0 & 0x86002c03c040000L) != 0L || (active1 & 0x1L) != 0L)
          {
-            jjmatchedKind = 74;
+            jjmatchedKind = 77;
             jjmatchedPos = 5;
             return 14;
          }
          return -1;
       case 6:
-         if ((active0 & 0x210001401e000000L) != 0L)
+         if ((active0 & 0x84002803c000000L) != 0L || (active1 & 0x1L) != 0L)
             return 14;
-         if ((active0 & 0x10002000020000L) != 0L)
+         if ((active0 & 0x20004000040000L) != 0L)
          {
             if (jjmatchedPos != 6)
             {
-               jjmatchedKind = 74;
+               jjmatchedKind = 77;
                jjmatchedPos = 6;
             }
             return 14;
          }
          return -1;
       case 7:
-         if ((active0 & 0x10002000020000L) != 0L)
-            return 14;
-         if ((active0 & 0x18000000L) != 0L)
+         if ((active0 & 0x30000000L) != 0L)
          {
-            jjmatchedKind = 74;
+            jjmatchedKind = 77;
             jjmatchedPos = 7;
             return 14;
          }
+         if ((active0 & 0x20004000040000L) != 0L)
+            return 14;
          return -1;
       case 8:
-         if ((active0 & 0x18000000L) != 0L)
+         if ((active0 & 0x30000000L) != 0L)
          {
-            jjmatchedKind = 74;
+            jjmatchedKind = 77;
             jjmatchedPos = 8;
             return 14;
          }
          return -1;
       case 9:
-         if ((active0 & 0x18000000L) != 0L)
+         if ((active0 & 0x30000000L) != 0L)
          {
-            jjmatchedKind = 74;
+            jjmatchedKind = 77;
             jjmatchedPos = 9;
             return 14;
          }
          return -1;
       case 10:
-         if ((active0 & 0x18000000L) != 0L)
+         if ((active0 & 0x30000000L) != 0L)
          {
-            jjmatchedKind = 74;
+            jjmatchedKind = 77;
             jjmatchedPos = 10;
             return 14;
          }
@@ -451,185 +485,179 @@ static private final int jjMoveStringLiteralDfa0_1()
    switch(curChar)
    {
       case 33:
-         jjmatchedKind = 92;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x2000000400000000L);
+         jjmatchedKind = 95;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x2000000000L, 0x1L);
       case 36:
-         return jjStartNfaWithStates_1(0, 88, 16);
+         return jjStartNfaWithStates_1(0, 91, 16);
       case 37:
-         jjmatchedKind = 110;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x400000000000000L);
+         jjmatchedKind = 113;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x2000000000000000L, 0x0L);
       case 38:
-         jjmatchedKind = 107;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x40001000000000L);
+         jjmatchedKind = 110;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x200008000000000L, 0x0L);
       case 40:
-         return jjStopAtPos(0, 78);
+         return jjStopAtPos(0, 81);
       case 41:
-         return jjStopAtPos(0, 79);
+         return jjStopAtPos(0, 82);
       case 42:
-         jjmatchedKind = 105;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x10000000000000L);
+         jjmatchedKind = 108;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x80000000000000L, 0x0L);
       case 43:
-         jjmatchedKind = 103;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x4002000000000L);
+         jjmatchedKind = 106;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x20010000000000L, 0x0L);
       case 44:
-         return jjStopAtPos(0, 85);
+         return jjStopAtPos(0, 88);
       case 45:
-         jjmatchedKind = 104;
-         return jjMoveStringLiteralDfa1_1(0x80000000L, 0x8004000000000L);
+         jjmatchedKind = 107;
+         return jjMoveStringLiteralDfa1_1(0x100000000L, 0x40020000000000L, 0x0L);
       case 46:
-         jjmatchedKind = 86;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x200000000000000L);
+         jjmatchedKind = 89;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x1000000000000000L, 0x0L);
       case 47:
-         jjmatchedKind = 106;
-         return jjMoveStringLiteralDfa1_1(0xa00L, 0x20000000000000L);
+         jjmatchedKind = 109;
+         return jjMoveStringLiteralDfa1_1(0xa00L, 0x100000000000000L, 0x0L);
       case 58:
-         jjmatchedKind = 94;
-         return jjMoveStringLiteralDfa1_1(0x100000000L, 0x0L);
+         jjmatchedKind = 97;
+         return jjMoveStringLiteralDfa1_1(0x200000000L, 0x0L, 0x0L);
       case 59:
-         return jjStopAtPos(0, 84);
+         return jjStopAtPos(0, 87);
       case 60:
-         jjmatchedKind = 91;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x800800100000000L);
+         jjmatchedKind = 94;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x4004000800000000L, 0x0L);
       case 61:
-         jjmatchedKind = 89;
-         return jjMoveStringLiteralDfa1_1(0x200000000L, 0x4000000080000000L);
+         jjmatchedKind = 92;
+         return jjMoveStringLiteralDfa1_1(0x400000000L, 0x400000000L, 0x2L);
       case 62:
-         jjmatchedKind = 90;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x1003000200000000L);
-      case 63:
          jjmatchedKind = 93;
-         return jjMoveStringLiteralDfa1_1(0x4L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x8018001000000000L, 0x0L);
+      case 63:
+         jjmatchedKind = 96;
+         return jjMoveStringLiteralDfa1_1(0x4L, 0x0L, 0x0L);
       case 64:
-         return jjStopAtPos(0, 87);
+         return jjStopAtPos(0, 90);
       case 91:
-         return jjStopAtPos(0, 82);
+         return jjStopAtPos(0, 85);
       case 93:
-         return jjStopAtPos(0, 83);
+         return jjStopAtPos(0, 86);
       case 94:
-         jjmatchedKind = 109;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x100000000000000L);
+         jjmatchedKind = 112;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x800000000000000L, 0x0L);
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa1_1(0x8000000000400000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x80000000800000L, 0x4L, 0x0L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa1_1(0x180000400000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0xc00000800000000L, 0x0L, 0x0L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa1_1(0x3800010000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x7000020000L, 0x0L, 0x0L);
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa1_1(0x40000c000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x2000018000000000L, 0x0L, 0x0L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa1_1(0x10010001300000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x20020002600000L, 0x0L, 0x0L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa1_1(0x800060000020000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x40400c0000040000L, 0x0L, 0x0L);
       case 71:
       case 103:
-         return jjMoveStringLiteralDfa1_1(0x80020000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x100040000000L, 0x0L, 0x0L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa1_1(0x300000000a080000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x8000000014100000L, 0x1L, 0x0L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa1_1(0x300000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x600000000000L, 0x0L, 0x0L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa1_1(0x4040000000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x200000000000000L, 0x2L, 0x0L);
       case 80:
       case 112:
-         return jjMoveStringLiteralDfa1_1(0x800000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x1000000L, 0x0L, 0x0L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa1_1(0x200400014000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x1000800028000000L, 0x0L, 0x0L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa1_1(0x21800040000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x103000080000000L, 0x0L, 0x0L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa1_1(0x6000000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0xc000000000000L, 0x0L, 0x0L);
       case 86:
       case 118:
-         return jjMoveStringLiteralDfa1_1(0x40000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x80000L, 0x0L, 0x0L);
       case 87:
       case 119:
-         return jjMoveStringLiteralDfa1_1(0x8000000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x10000000000000L, 0x0L, 0x0L);
       case 123:
-         return jjStopAtPos(0, 80);
+         return jjStopAtPos(0, 83);
       case 124:
-         jjmatchedKind = 108;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x80000800000000L);
+         jjmatchedKind = 111;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x400004000000000L, 0x0L);
       case 125:
-         return jjStopAtPos(0, 81);
+         return jjStopAtPos(0, 84);
       case 126:
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x8000000000000000L);
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x4L);
       default :
          return jjMoveNfa_1(3, 0);
    }
 }
-static private final int jjMoveStringLiteralDfa1_1(long active0, long active1)
+static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, long active2)
 {
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(0, active0, active1, 0L);
+      jjStopStringLiteralDfa_1(0, active0, active1, active2);
       return 1;
    }
    switch(curChar)
    {
       case 38:
-         if ((active1 & 0x1000000000L) != 0L)
-            return jjStopAtPos(1, 100);
+         if ((active1 & 0x8000000000L) != 0L)
+            return jjStopAtPos(1, 103);
          break;
       case 42:
          if ((active0 & 0x800L) != 0L)
             return jjStartNfaWithStates_1(1, 11, 0);
          break;
       case 43:
-         if ((active1 & 0x2000000000L) != 0L)
-            return jjStopAtPos(1, 101);
+         if ((active1 & 0x10000000000L) != 0L)
+            return jjStopAtPos(1, 104);
          break;
       case 45:
-         if ((active1 & 0x4000000000L) != 0L)
-            return jjStopAtPos(1, 102);
+         if ((active1 & 0x20000000000L) != 0L)
+            return jjStopAtPos(1, 105);
          break;
       case 47:
          if ((active0 & 0x200L) != 0L)
             return jjStopAtPos(1, 9);
          break;
       case 58:
-         if ((active0 & 0x100000000L) != 0L)
-            return jjStopAtPos(1, 32);
+         if ((active0 & 0x200000000L) != 0L)
+            return jjStopAtPos(1, 33);
          break;
       case 60:
-         if ((active1 & 0x800000000000L) != 0L)
+         if ((active1 & 0x4000000000000L) != 0L)
          {
-            jjmatchedKind = 111;
+            jjmatchedKind = 114;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x800000000000000L);
+         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x4000000000000000L, active2, 0L);
       case 61:
-         if ((active1 & 0x80000000L) != 0L)
+         if ((active1 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 95;
+            jjmatchedKind = 98;
             jjmatchedPos = 1;
          }
-         else if ((active1 & 0x100000000L) != 0L)
-            return jjStopAtPos(1, 96);
-         else if ((active1 & 0x200000000L) != 0L)
-            return jjStopAtPos(1, 97);
-         else if ((active1 & 0x400000000L) != 0L)
+         else if ((active1 & 0x800000000L) != 0L)
+            return jjStopAtPos(1, 99);
+         else if ((active1 & 0x1000000000L) != 0L)
+            return jjStopAtPos(1, 100);
+         else if ((active1 & 0x2000000000L) != 0L)
          {
-            jjmatchedKind = 98;
+            jjmatchedKind = 101;
             jjmatchedPos = 1;
          }
-         else if ((active1 & 0x4000000000000L) != 0L)
-            return jjStopAtPos(1, 114);
-         else if ((active1 & 0x8000000000000L) != 0L)
-            return jjStopAtPos(1, 115);
-         else if ((active1 & 0x10000000000000L) != 0L)
-            return jjStopAtPos(1, 116);
          else if ((active1 & 0x20000000000000L) != 0L)
             return jjStopAtPos(1, 117);
          else if ((active1 & 0x40000000000000L) != 0L)
@@ -642,461 +670,480 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1)
             return jjStopAtPos(1, 121);
          else if ((active1 & 0x400000000000000L) != 0L)
             return jjStopAtPos(1, 122);
-         else if ((active1 & 0x8000000000000000L) != 0L)
-            return jjStopAtPos(1, 127);
-         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x6000000000000000L);
+         else if ((active1 & 0x800000000000000L) != 0L)
+            return jjStopAtPos(1, 123);
+         else if ((active1 & 0x1000000000000000L) != 0L)
+            return jjStopAtPos(1, 124);
+         else if ((active1 & 0x2000000000000000L) != 0L)
+            return jjStopAtPos(1, 125);
+         else if ((active2 & 0x4L) != 0L)
+            return jjStopAtPos(1, 130);
+         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x3L);
       case 62:
          if ((active0 & 0x4L) != 0L)
             return jjStopAtPos(1, 2);
-         else if ((active0 & 0x80000000L) != 0L)
-            return jjStopAtPos(1, 31);
-         else if ((active0 & 0x200000000L) != 0L)
-            return jjStopAtPos(1, 33);
-         else if ((active1 & 0x1000000000000L) != 0L)
+         else if ((active0 & 0x100000000L) != 0L)
+            return jjStopAtPos(1, 32);
+         else if ((active0 & 0x400000000L) != 0L)
+            return jjStopAtPos(1, 34);
+         else if ((active1 & 0x8000000000000L) != 0L)
          {
-            jjmatchedKind = 112;
+            jjmatchedKind = 115;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x1002000000000000L);
+         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x8010000000000000L, active2, 0L);
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa2_1(active0, 0x20800040000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x41000080000L, active1, 0L, active2, 0L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa2_1(active0, 0x40000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x200000000000000L, active1, 0L, active2, 0L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa2_1(active0, 0x1000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x2000000L, active1, 0L, active2, 0L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa2_1(active0, 0x200504014000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x1000a08028000000L, active1, 0L, active2, 0L);
       case 70:
       case 102:
-         if ((active0 & 0x80000L) != 0L)
-            return jjStartNfaWithStates_1(1, 19, 14);
+         if ((active0 & 0x100000L) != 0L)
+            return jjStartNfaWithStates_1(1, 20, 14);
          break;
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa2_1(active0, 0xa000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x14000000000000L, active1, 0L, active2, 0L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa2_1(active0, 0x800000020310000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x4000000040620000L, active1, 0L, active2, 0L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa2_1(active0, 0xb01000000a000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x8020000014000000L, active1, 0x5L, active2, 0L);
       case 79:
       case 111:
-         if ((active0 & 0x8000000000L) != 0L)
+         if ((active0 & 0x10000000000L) != 0L)
          {
-            jjmatchedKind = 39;
+            jjmatchedKind = 40;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_1(active0, 0x5800c3000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x2c40186000000000L, active1, 0L, active2, 0L);
       case 82:
       case 114:
-         if ((active0 & 0x4000000000000000L) != 0L)
-            return jjStartNfaWithStates_1(1, 62, 14);
-         return jjMoveStringLiteralDfa2_1(active0, 0x4000400c00000L, active1, 0L);
+         if ((active1 & 0x2L) != 0L)
+            return jjStartNfaWithStates_1(1, 65, 14);
+         return jjMoveStringLiteralDfa2_1(active0, 0x8000801800000L, active1, 0L, active2, 0L);
+      case 83:
+      case 115:
+         if ((active0 & 0x80000000000000L) != 0L)
+            return jjStartNfaWithStates_1(1, 55, 14);
+         break;
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa2_1(active0, 0x20000040000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x100000080000000L, active1, 0L, active2, 0L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa2_1(active0, 0xa00000020000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x1400000040000L, active1, 0L, active2, 0L);
       case 87:
       case 119:
-         return jjMoveStringLiteralDfa2_1(active0, 0x1000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x2000000000000L, active1, 0L, active2, 0L);
       case 88:
       case 120:
-         return jjMoveStringLiteralDfa2_1(active0, 0x10000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x20000000000L, active1, 0L, active2, 0L);
       case 124:
-         if ((active1 & 0x800000000L) != 0L)
-            return jjStopAtPos(1, 99);
+         if ((active1 & 0x4000000000L) != 0L)
+            return jjStopAtPos(1, 102);
          break;
       default :
          break;
    }
-   return jjStartNfa_1(0, active0, active1, 0L);
+   return jjStartNfa_1(0, active0, active1, active2);
 }
-static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long old1, long active1)
+static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long old1, long active1, long old2, long active2)
 {
-   if (((active0 &= old0) | (active1 &= old1)) == 0L)
-      return jjStartNfa_1(0, old0, old1, 0L);
+   if (((active0 &= old0) | (active1 &= old1) | (active2 &= old2)) == 0L)
+      return jjStartNfa_1(0, old0, old1, old2); 
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(1, active0, active1, 0L);
+      jjStopStringLiteralDfa_1(1, active0, active1, active2);
       return 2;
    }
    switch(curChar)
    {
       case 61:
-         if ((active1 & 0x800000000000000L) != 0L)
-            return jjStopAtPos(2, 123);
-         else if ((active1 & 0x1000000000000000L) != 0L)
-            return jjStopAtPos(2, 124);
-         else if ((active1 & 0x2000000000000000L) != 0L)
-            return jjStopAtPos(2, 125);
-         else if ((active1 & 0x4000000000000000L) != 0L)
+         if ((active1 & 0x4000000000000000L) != 0L)
             return jjStopAtPos(2, 126);
+         else if ((active1 & 0x8000000000000000L) != 0L)
+            return jjStopAtPos(2, 127);
+         else if ((active2 & 0x1L) != 0L)
+            return jjStopAtPos(2, 128);
+         else if ((active2 & 0x2L) != 0L)
+            return jjStopAtPos(2, 129);
          break;
       case 62:
-         if ((active1 & 0x2000000000000L) != 0L)
-            return jjStopAtPos(2, 113);
+         if ((active1 & 0x10000000000000L) != 0L)
+            return jjStopAtPos(2, 116);
          break;
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa3_1(active0, 0x200000040010000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x1000000080020000L, active1, 0L, active2, 0L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa3_1(active0, 0xa000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x14000000L, active1, 0L, active2, 0L);
       case 68:
       case 100:
-         if ((active0 & 0x8000000000000000L) != 0L)
-            return jjStartNfaWithStates_1(2, 63, 14);
-         return jjMoveStringLiteralDfa3_1(active0, 0x10000000000000L, active1, 0L);
+         if ((active1 & 0x4L) != 0L)
+            return jjStartNfaWithStates_1(2, 66, 14);
+         return jjMoveStringLiteralDfa3_1(active0, 0x20000000000000L, active1, 0L, active2, 0L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa3_1(active0, 0x400000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x800000000L, active1, 0L, active2, 0L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa3_1(active0, 0x4000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x8000000000L, active1, 0L, active2, 0L);
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa3_1(active0, 0x1000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x2000000L, active1, 0L, active2, 0L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa3_1(active0, 0xb000000800000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x16000001000000L, active1, 0L, active2, 0L);
       case 74:
       case 106:
-         return jjMoveStringLiteralDfa3_1(active0, 0x40000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x200000000000000L, active1, 0L, active2, 0L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa3_1(active0, 0x220000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x440000000000L, active1, 0L, active2, 0L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa3_1(active0, 0x3000020000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x6000040000L, active1, 0L, active2, 0L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa3_1(active0, 0x980000020000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x4c00000040000000L, active1, 0L, active2, 0L);
       case 80:
       case 112:
-         return jjMoveStringLiteralDfa3_1(active0, 0x800000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x1000000000000L, active1, 0L, active2, 0L);
       case 81:
       case 113:
-         return jjMoveStringLiteralDfa3_1(active0, 0x14000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x28000000L, active1, 0L, active2, 0L);
       case 82:
       case 114:
-         if ((active0 & 0x40000L) != 0L)
-            return jjStartNfaWithStates_1(2, 18, 14);
-         else if ((active0 & 0x40000000000L) != 0L)
-            return jjStartNfaWithStates_1(2, 42, 14);
-         return jjMoveStringLiteralDfa3_1(active0, 0x20000000400000L, active1, 0L);
+         if ((active0 & 0x80000L) != 0L)
+            return jjStartNfaWithStates_1(2, 19, 14);
+         else if ((active0 & 0x80000000000L) != 0L)
+         {
+            jjmatchedKind = 43;
+            jjmatchedPos = 2;
+         }
+         return jjMoveStringLiteralDfa3_1(active0, 0x140000000800000L, active1, 0L, active2, 0L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa3_1(active0, 0x800300000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x1000600000L, active1, 0L, active2, 0L);
       case 84:
       case 116:
-         if ((active0 & 0x1000000000000000L) != 0L)
+         if ((active0 & 0x8000000000000000L) != 0L)
          {
-            jjmatchedKind = 60;
+            jjmatchedKind = 63;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_1(active0, 0x2000490000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x920000000000L, active1, 0x1L, active2, 0L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa3_1(active0, 0x404000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x2008000000000000L, active1, 0L, active2, 0L);
       case 87:
       case 119:
-         if ((active0 & 0x100000000000L) != 0L)
-            return jjStartNfaWithStates_1(2, 44, 14);
+         if ((active0 & 0x200000000000L) != 0L)
+            return jjStartNfaWithStates_1(2, 45, 14);
          break;
       default :
          break;
    }
-   return jjStartNfa_1(1, active0, active1, 0L);
+   return jjStartNfa_1(1, active0, active1, active2);
 }
-static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long old1, long active1)
+static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long old1, long active1, long old2, long active2)
 {
-   if (((active0 &= old0) | (active1 &= old1)) == 0L)
-      return jjStartNfa_1(1, old0, old1, 0L);
+   if (((active0 &= old0) | (active1 &= old1) | (active2 &= old2)) == 0L)
+      return jjStartNfa_1(1, old0, old1, old2); 
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(2, active0, 0L, 0L);
+      jjStopStringLiteralDfa_1(2, active0, active1, 0L);
       return 3;
    }
    switch(curChar)
    {
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa4_1(active0, 0x800004400400000L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x4000008800800000L, active1, 0L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa4_1(active0, 0x400000020000000L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x2000000040000000L, active1, 0L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa4_1(active0, 0x20000L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x40000L, active1, 0L);
       case 69:
       case 101:
-         if ((active0 & 0x200000L) != 0L)
+         if ((active0 & 0x400000L) != 0L)
          {
-            jjmatchedKind = 21;
+            jjmatchedKind = 22;
             jjmatchedPos = 3;
          }
-         else if ((active0 & 0x800000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 35, 14);
-         else if ((active0 & 0x4000000000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 50, 14);
-         return jjMoveStringLiteralDfa4_1(active0, 0x2040810000100000L);
+         else if ((active0 & 0x1000000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 36, 14);
+         else if ((active0 & 0x8000000000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 51, 14);
+         return jjMoveStringLiteralDfa4_1(active0, 0x241020000200000L, active1, 0x1L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa4_1(active0, 0x20000000000000L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x100000000000000L, active1, 0L);
       case 76:
       case 108:
-         if ((active0 & 0x200000000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 45, 14);
-         else if ((active0 & 0x80000000000000L) != 0L)
+         if ((active0 & 0x400000000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 46, 14);
+         else if ((active0 & 0x400000000000000L) != 0L)
          {
-            jjmatchedKind = 55;
+            jjmatchedKind = 58;
             jjmatchedPos = 3;
          }
-         else if ((active0 & 0x200000000000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 57, 14);
-         return jjMoveStringLiteralDfa4_1(active0, 0x10800000a000000L);
+         else if ((active0 & 0x1000000000000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 60, 14);
+         return jjMoveStringLiteralDfa4_1(active0, 0x810000014000000L, active1, 0L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa4_1(active0, 0x800000L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x1000000L, active1, 0L);
       case 79:
       case 111:
-         if ((active0 & 0x1000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 24, 14);
-         else if ((active0 & 0x80000000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 43, 14);
+         if ((active0 & 0x2000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 25, 14);
+         else if ((active0 & 0x100000000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 44, 14);
          break;
       case 83:
       case 115:
-         if ((active0 & 0x2000000000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 49, 14);
-         return jjMoveStringLiteralDfa4_1(active0, 0x21000010000L);
+         if ((active0 & 0x4000000000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 50, 14);
+         return jjMoveStringLiteralDfa4_1(active0, 0x42000020000L, active1, 0L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa4_1(active0, 0x1002040000000L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x2004080000000L, active1, 0L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa4_1(active0, 0x400014000000L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x800028000000L, active1, 0L);
       case 87:
       case 119:
-         return jjMoveStringLiteralDfa4_1(active0, 0x10000000000000L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x20000000000000L, active1, 0L);
       default :
          break;
    }
-   return jjStartNfa_1(2, active0, 0L, 0L);
+   return jjStartNfa_1(2, active0, active1, 0L);
 }
-static private final int jjMoveStringLiteralDfa4_1(long old0, long active0)
+static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long old1, long active1)
 {
-   if (((active0 &= old0)) == 0L)
-      return jjStartNfa_1(2, old0, 0L, 0L);
+   if (((active0 &= old0) | (active1 &= old1)) == 0L)
+      return jjStartNfa_1(2, old0, old1, 0L);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(3, active0, 0L, 0L);
+      jjStopStringLiteralDfa_1(3, active0, active1, 0L);
       return 4;
    }
    switch(curChar)
    {
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa5_1(active0, 0x20000000L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x40000040000000L, active1, 0L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa5_1(active0, 0x41000000000000L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x202000000000000L, active1, 0L);
       case 69:
       case 101:
-         if ((active0 & 0x20000000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 41, 14);
-         else if ((active0 & 0x8000000000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 51, 14);
-         return jjMoveStringLiteralDfa5_1(active0, 0x100000000000000L);
+         if ((active0 & 0x40000000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 42, 14);
+         else if ((active0 & 0x10000000000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 52, 14);
+         return jjMoveStringLiteralDfa5_1(active0, 0x800000000000000L, active1, 0L);
       case 71:
       case 103:
-         return jjMoveStringLiteralDfa5_1(active0, 0x2000000000000000L);
+         return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x1L);
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa5_1(active0, 0x10000000000000L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x20000000000000L, active1, 0L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa5_1(active0, 0x2054100000L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x40a8200000L, active1, 0L);
       case 75:
       case 107:
-         if ((active0 & 0x400000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 34, 14);
+         if ((active0 & 0x800000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 35, 14);
          break;
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa5_1(active0, 0x400000000000000L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x2000000000000000L, active1, 0L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa5_1(active0, 0x20010000000000L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x100020000000000L, active1, 0L);
       case 82:
       case 114:
-         if ((active0 & 0x800000000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 47, 14);
-         return jjMoveStringLiteralDfa5_1(active0, 0x400000000000L);
+         if ((active0 & 0x1000000000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 48, 14);
+         return jjMoveStringLiteralDfa5_1(active0, 0x800000000000L, active1, 0L);
       case 83:
       case 115:
-         if ((active0 & 0x10000L) != 0L)
-            return jjStartNfaWithStates_1(4, 16, 14);
+         if ((active0 & 0x20000L) != 0L)
+            return jjStartNfaWithStates_1(4, 17, 14);
          break;
       case 84:
       case 116:
-         if ((active0 & 0x800000L) != 0L)
-            return jjStartNfaWithStates_1(4, 23, 14);
-         else if ((active0 & 0x1000000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 36, 14);
-         else if ((active0 & 0x800000000000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 59, 14);
-         return jjMoveStringLiteralDfa5_1(active0, 0x20000L);
+         if ((active0 & 0x1000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 24, 14);
+         else if ((active0 & 0x2000000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 37, 14);
+         else if ((active0 & 0x4000000000000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 62, 14);
+         return jjMoveStringLiteralDfa5_1(active0, 0x40000L, active1, 0L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa5_1(active0, 0x400a000000L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x8014000000L, active1, 0L);
       case 89:
       case 121:
-         if ((active0 & 0x400000L) != 0L)
-            return jjStartNfaWithStates_1(4, 22, 14);
+         if ((active0 & 0x800000L) != 0L)
+            return jjStartNfaWithStates_1(4, 23, 14);
          break;
       default :
          break;
    }
-   return jjStartNfa_1(3, active0, 0L, 0L);
+   return jjStartNfa_1(3, active0, active1, 0L);
 }
-static private final int jjMoveStringLiteralDfa5_1(long old0, long active0)
+static private final int jjMoveStringLiteralDfa5_1(long old0, long active0, long old1, long active1)
 {
-   if (((active0 &= old0)) == 0L)
-      return jjStartNfa_1(3, old0, 0L, 0L);
+   if (((active0 &= old0) | (active1 &= old1)) == 0L)
+      return jjStartNfa_1(3, old0, old1, 0L);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(4, active0, 0L, 0L);
+      jjStopStringLiteralDfa_1(4, active0, active1, 0L);
       return 5;
    }
    switch(curChar)
    {
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa6_1(active0, 0x100000000000000L);
+         return jjMoveStringLiteralDfa6_1(active0, 0x800000000000000L, active1, 0L);
       case 67:
       case 99:
-         if ((active0 & 0x40000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 30, 14);
-         break;
+         if ((active0 & 0x80000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 31, 14);
+         return jjMoveStringLiteralDfa6_1(active0, 0x40000000000000L, active1, 0L);
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa6_1(active0, 0x1000a000000L);
+         return jjMoveStringLiteralDfa6_1(active0, 0x20014000000L, active1, 0L);
       case 69:
       case 101:
-         if ((active0 & 0x400000000000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 58, 14);
-         return jjMoveStringLiteralDfa6_1(active0, 0x2000000000000000L);
+         if ((active0 & 0x2000000000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 61, 14);
+         return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x1L);
       case 70:
       case 102:
-         if ((active0 & 0x100000L) != 0L)
-            return jjStartNfaWithStates_1(5, 20, 14);
+         if ((active0 & 0x200000L) != 0L)
+            return jjStartNfaWithStates_1(5, 21, 14);
          break;
       case 71:
       case 103:
-         if ((active0 & 0x20000000000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 53, 14);
+         if ((active0 & 0x100000000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 56, 14);
          break;
       case 72:
       case 104:
-         if ((active0 & 0x1000000000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 48, 14);
+         if ((active0 & 0x2000000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 49, 14);
          break;
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa6_1(active0, 0x10000000020000L);
+         return jjMoveStringLiteralDfa6_1(active0, 0x20000000040000L, active1, 0L);
       case 76:
       case 108:
-         if ((active0 & 0x20000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 29, 14);
-         return jjMoveStringLiteralDfa6_1(active0, 0x4000000000L);
+         if ((active0 & 0x40000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 30, 14);
+         return jjMoveStringLiteralDfa6_1(active0, 0x8000000000L, active1, 0L);
       case 78:
       case 110:
-         if ((active0 & 0x400000000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 46, 14);
-         return jjMoveStringLiteralDfa6_1(active0, 0x2000000000L);
+         if ((active0 & 0x800000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 47, 14);
+         return jjMoveStringLiteralDfa6_1(active0, 0x4000000000L, active1, 0L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa6_1(active0, 0x14000000L);
+         return jjMoveStringLiteralDfa6_1(active0, 0x28000000L, active1, 0L);
       case 84:
       case 116:
-         if ((active0 & 0x40000000000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 54, 14);
+         if ((active0 & 0x200000000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 57, 14);
          break;
       default :
          break;
    }
-   return jjStartNfa_1(4, active0, 0L, 0L);
+   return jjStartNfa_1(4, active0, active1, 0L);
 }
-static private final int jjMoveStringLiteralDfa6_1(long old0, long active0)
+static private final int jjMoveStringLiteralDfa6_1(long old0, long active0, long old1, long active1)
 {
-   if (((active0 &= old0)) == 0L)
-      return jjStartNfa_1(4, old0, 0L, 0L);
+   if (((active0 &= old0) | (active1 &= old1)) == 0L)
+      return jjStartNfa_1(4, old0, old1, 0L);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(5, active0, 0L, 0L);
+      jjStopStringLiteralDfa_1(5, active0, active1, 0L);
       return 6;
    }
    switch(curChar)
    {
       case 69:
       case 101:
-         if ((active0 & 0x2000000L) != 0L)
+         if ((active0 & 0x4000000L) != 0L)
          {
-            jjmatchedKind = 25;
+            jjmatchedKind = 26;
             jjmatchedPos = 6;
          }
-         else if ((active0 & 0x4000000L) != 0L)
+         else if ((active0 & 0x8000000L) != 0L)
          {
-            jjmatchedKind = 26;
+            jjmatchedKind = 27;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_1(active0, 0x18000000L);
+         return jjMoveStringLiteralDfa7_1(active0, 0x30000000L, active1, 0L);
+      case 72:
+      case 104:
+         if ((active0 & 0x40000000000000L) != 0L)
+            return jjStartNfaWithStates_1(6, 54, 14);
+         break;
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa7_1(active0, 0x10000000000000L);
+         return jjMoveStringLiteralDfa7_1(active0, 0x20000000000000L, active1, 0L);
       case 78:
       case 110:
-         if ((active0 & 0x100000000000000L) != 0L)
-            return jjStartNfaWithStates_1(6, 56, 14);
+         if ((active0 & 0x800000000000000L) != 0L)
+            return jjStartNfaWithStates_1(6, 59, 14);
          break;
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa7_1(active0, 0x20000L);
+         return jjMoveStringLiteralDfa7_1(active0, 0x40000L, active1, 0L);
       case 82:
       case 114:
-         if ((active0 & 0x2000000000000000L) != 0L)
-            return jjStartNfaWithStates_1(6, 61, 14);
+         if ((active1 & 0x1L) != 0L)
+            return jjStartNfaWithStates_1(6, 64, 14);
          break;
       case 83:
       case 115:
-         if ((active0 & 0x10000000000L) != 0L)
-            return jjStartNfaWithStates_1(6, 40, 14);
+         if ((active0 & 0x20000000000L) != 0L)
+            return jjStartNfaWithStates_1(6, 41, 14);
          break;
       case 84:
       case 116:
-         if ((active0 & 0x4000000000L) != 0L)
-            return jjStartNfaWithStates_1(6, 38, 14);
+         if ((active0 & 0x8000000000L) != 0L)
+            return jjStartNfaWithStates_1(6, 39, 14);
          break;
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa7_1(active0, 0x2000000000L);
+         return jjMoveStringLiteralDfa7_1(active0, 0x4000000000L, active1, 0L);
       default :
          break;
    }
-   return jjStartNfa_1(5, active0, 0L, 0L);
+   return jjStartNfa_1(5, active0, active1, 0L);
 }
-static private final int jjMoveStringLiteralDfa7_1(long old0, long active0)
+static private final int jjMoveStringLiteralDfa7_1(long old0, long active0, long old1, long active1)
 {
-   if (((active0 &= old0)) == 0L)
-      return jjStartNfa_1(5, old0, 0L, 0L);
+   if (((active0 &= old0) | (active1 &= old1)) == 0L)
+      return jjStartNfa_1(5, old0, old1, 0L);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
       jjStopStringLiteralDfa_1(6, active0, 0L, 0L);
@@ -1105,18 +1152,18 @@ static private final int jjMoveStringLiteralDfa7_1(long old0, long active0)
    switch(curChar)
    {
       case 95:
-         return jjMoveStringLiteralDfa8_1(active0, 0x18000000L);
+         return jjMoveStringLiteralDfa8_1(active0, 0x30000000L);
       case 69:
       case 101:
-         if ((active0 & 0x2000000000L) != 0L)
-            return jjStartNfaWithStates_1(7, 37, 14);
-         else if ((active0 & 0x10000000000000L) != 0L)
-            return jjStartNfaWithStates_1(7, 52, 14);
+         if ((active0 & 0x4000000000L) != 0L)
+            return jjStartNfaWithStates_1(7, 38, 14);
+         else if ((active0 & 0x20000000000000L) != 0L)
+            return jjStartNfaWithStates_1(7, 53, 14);
          break;
       case 78:
       case 110:
-         if ((active0 & 0x20000L) != 0L)
-            return jjStartNfaWithStates_1(7, 17, 14);
+         if ((active0 & 0x40000L) != 0L)
+            return jjStartNfaWithStates_1(7, 18, 14);
          break;
       default :
          break;
@@ -1136,7 +1183,7 @@ static private final int jjMoveStringLiteralDfa8_1(long old0, long active0)
    {
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa9_1(active0, 0x18000000L);
+         return jjMoveStringLiteralDfa9_1(active0, 0x30000000L);
       default :
          break;
    }
@@ -1155,7 +1202,7 @@ static private final int jjMoveStringLiteralDfa9_1(long old0, long active0)
    {
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa10_1(active0, 0x18000000L);
+         return jjMoveStringLiteralDfa10_1(active0, 0x30000000L);
       default :
          break;
    }
@@ -1174,7 +1221,7 @@ static private final int jjMoveStringLiteralDfa10_1(long old0, long active0)
    {
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa11_1(active0, 0x18000000L);
+         return jjMoveStringLiteralDfa11_1(active0, 0x30000000L);
       default :
          break;
    }
@@ -1193,10 +1240,10 @@ static private final int jjMoveStringLiteralDfa11_1(long old0, long active0)
    {
       case 69:
       case 101:
-         if ((active0 & 0x8000000L) != 0L)
-            return jjStartNfaWithStates_1(11, 27, 14);
-         else if ((active0 & 0x10000000L) != 0L)
+         if ((active0 & 0x10000000L) != 0L)
             return jjStartNfaWithStates_1(11, 28, 14);
+         else if ((active0 & 0x20000000L) != 0L)
+            return jjStartNfaWithStates_1(11, 29, 14);
          break;
       default :
          break;
@@ -1240,14 +1287,14 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjstateSet[jjnewStateCnt++] = 2;
                   if ((0x3fe000000000000L & l) != 0L)
                   {
-                     if (kind > 64)
-                        kind = 64;
+                     if (kind > 67)
+                        kind = 67;
                      jjCheckNAddTwoStates(5, 6);
                   }
                   else if (curChar == 48)
                   {
-                     if (kind > 64)
-                        kind = 64;
+                     if (kind > 67)
+                        kind = 67;
                      jjCheckNAddStates(21, 23);
                   }
                   break;
@@ -1266,15 +1313,15 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 4:
                   if ((0x3fe000000000000L & l) == 0L)
                      break;
-                  if (kind > 64)
-                     kind = 64;
+                  if (kind > 67)
+                     kind = 67;
                   jjCheckNAddTwoStates(5, 6);
                   break;
                case 5:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 64)
-                     kind = 64;
+                  if (kind > 67)
+                     kind = 67;
                   jjCheckNAddTwoStates(5, 6);
                   break;
                case 7:
@@ -1284,8 +1331,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 8:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 68)
-                     kind = 68;
+                  if (kind > 71)
+                     kind = 71;
                   jjCheckNAddStates(24, 26);
                   break;
                case 10:
@@ -1295,15 +1342,15 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 11:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 68)
-                     kind = 68;
+                  if (kind > 71)
+                     kind = 71;
                   jjCheckNAddTwoStates(11, 12);
                   break;
                case 14:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 74)
-                     kind = 74;
+                  if (kind > 77)
+                     kind = 77;
                   jjstateSet[jjnewStateCnt++] = 14;
                   break;
                case 15:
@@ -1313,8 +1360,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 17:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 128)
-                     kind = 128;
+                  if (kind > 131)
+                     kind = 131;
                   jjstateSet[jjnewStateCnt++] = 17;
                   break;
                case 18:
@@ -1328,15 +1375,15 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 20:
                   if (curChar != 46)
                      break;
-                  if (kind > 68)
-                     kind = 68;
+                  if (kind > 71)
+                     kind = 71;
                   jjCheckNAddStates(27, 29);
                   break;
                case 21:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 68)
-                     kind = 68;
+                  if (kind > 71)
+                     kind = 71;
                   jjCheckNAddStates(27, 29);
                   break;
                case 23:
@@ -1346,8 +1393,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 24:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 68)
-                     kind = 68;
+                  if (kind > 71)
+                     kind = 71;
                   jjCheckNAddTwoStates(24, 12);
                   break;
                case 25:
@@ -1361,8 +1408,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 28:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 68)
-                     kind = 68;
+                  if (kind > 71)
+                     kind = 71;
                   jjCheckNAddTwoStates(28, 12);
                   break;
                case 29:
@@ -1380,22 +1427,22 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 33:
                   if (curChar != 48)
                      break;
-                  if (kind > 64)
-                     kind = 64;
+                  if (kind > 67)
+                     kind = 67;
                   jjCheckNAddStates(21, 23);
                   break;
                case 35:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 64)
-                     kind = 64;
+                  if (kind > 67)
+                     kind = 67;
                   jjCheckNAddTwoStates(35, 6);
                   break;
                case 36:
                   if ((0xff000000000000L & l) == 0L)
                      break;
-                  if (kind > 64)
-                     kind = 64;
+                  if (kind > 67)
+                     kind = 67;
                   jjCheckNAddTwoStates(36, 6);
                   break;
                case 37:
@@ -1411,8 +1458,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjCheckNAddStates(33, 35);
                   break;
                case 41:
-                  if (curChar == 34 && kind > 70)
-                     kind = 70;
+                  if (curChar == 34 && kind > 73)
+                     kind = 73;
                   break;
                case 42:
                   if ((0xfffffffbffffffffL & l) != 0L)
@@ -1423,8 +1470,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjCheckNAddStates(36, 38);
                   break;
                case 45:
-                  if (curChar == 34 && kind > 71)
-                     kind = 71;
+                  if (curChar == 34 && kind > 74)
+                     kind = 74;
                   break;
                case 46:
                   if (curChar == 39)
@@ -1439,8 +1486,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjCheckNAddStates(39, 41);
                   break;
                case 50:
-                  if (curChar == 39 && kind > 70)
-                     kind = 70;
+                  if (curChar == 39 && kind > 73)
+                     kind = 73;
                   break;
                case 51:
                   if ((0xffffff7fffffffffL & l) != 0L)
@@ -1451,8 +1498,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjCheckNAddStates(42, 44);
                   break;
                case 54:
-                  if (curChar == 39 && kind > 72)
-                     kind = 72;
+                  if (curChar == 39 && kind > 75)
+                     kind = 75;
                   break;
                case 56:
                   jjAddStates(45, 47);
@@ -1474,8 +1521,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 3:
                   if ((0x87fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 74)
-                        kind = 74;
+                     if (kind > 77)
+                        kind = 77;
                      jjCheckNAdd(14);
                   }
                   else if (curChar == 96)
@@ -1486,31 +1533,31 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      kind = 10;
                   break;
                case 6:
-                  if ((0x100000001000L & l) != 0L && kind > 64)
-                     kind = 64;
+                  if ((0x100000001000L & l) != 0L && kind > 67)
+                     kind = 67;
                   break;
                case 9:
                   if ((0x2000000020L & l) != 0L)
                      jjAddStates(57, 58);
                   break;
                case 12:
-                  if ((0x5000000050L & l) != 0L && kind > 68)
-                     kind = 68;
+                  if ((0x5000000050L & l) != 0L && kind > 71)
+                     kind = 71;
                   break;
                case 13:
                case 14:
                   if ((0x87fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 74)
-                     kind = 74;
+                  if (kind > 77)
+                     kind = 77;
                   jjCheckNAdd(14);
                   break;
                case 16:
                case 17:
                   if ((0x87fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 128)
-                     kind = 128;
+                  if (kind > 131)
+                     kind = 131;
                   jjCheckNAdd(17);
                   break;
                case 22:
@@ -1532,8 +1579,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 35:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 64)
-                     kind = 64;
+                  if (kind > 67)
+                     kind = 67;
                   jjCheckNAddTwoStates(35, 6);
                   break;
                case 38:
@@ -1581,8 +1628,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjstateSet[jjnewStateCnt++] = 57;
                   break;
                case 59:
-                  if (curChar == 96 && kind > 70)
-                     kind = 70;
+                  if (curChar == 96 && kind > 73)
+                     kind = 73;
                   break;
                case 60:
                   if ((0xfffffffeffffffffL & l) != 0L)
@@ -1597,8 +1644,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjstateSet[jjnewStateCnt++] = 61;
                   break;
                case 63:
-                  if (curChar == 96 && kind > 73)
-                     kind = 73;
+                  if (curChar == 96 && kind > 76)
+                     kind = 76;
                   break;
                default : break;
             }
@@ -1616,8 +1663,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 14:
                   if ((jjbitVec0[i2] & l2) == 0L)
                      break;
-                  if (kind > 74)
-                     kind = 74;
+                  if (kind > 77)
+                     kind = 77;
                   jjCheckNAdd(14);
                   break;
                case 1:
@@ -1628,8 +1675,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 17:
                   if ((jjbitVec0[i2] & l2) == 0L)
                      break;
-                  if (kind > 128)
-                     kind = 128;
+                  if (kind > 131)
+                     kind = 131;
                   jjCheckNAdd(17);
                   break;
                case 38:
@@ -1678,7 +1725,7 @@ static private final int jjMoveStringLiteralDfa0_3()
    switch(curChar)
    {
       case 42:
-         return jjMoveStringLiteralDfa1_3(0x2000L);
+         return jjMoveStringLiteralDfa1_3(0x4000L);
       default :
          return 1;
    }
@@ -1692,8 +1739,8 @@ static private final int jjMoveStringLiteralDfa1_3(long active0)
    switch(curChar)
    {
       case 47:
-         if ((active0 & 0x2000L) != 0L)
-            return jjStopAtPos(1, 13);
+         if ((active0 & 0x4000L) != 0L)
+            return jjStopAtPos(1, 14);
          break;
       default :
          return 2;
@@ -1710,16 +1757,16 @@ static final int[] jjnextStates = {
 public static final String[] jjstrLiteralImages = {
 "", null, "\77\76", null, null, null, null, null, null, null, null, null, null, 
 null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
-null, null, null, null, "\55\76", "\72\72", "\75\76", null, null, null, null, null, 
+null, null, null, null, null, "\55\76", "\72\72", "\75\76", null, null, null, null, 
+null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
 null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
 null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
-null, null, null, null, null, null, null, null, null, null, null, "\50", "\51", 
-"\173", "\175", "\133", "\135", "\73", "\54", "\56", "\100", "\44", "\75", "\76", 
-"\74", "\41", "\77", "\72", "\75\75", "\74\75", "\76\75", "\41\75", "\174\174", 
-"\46\46", "\53\53", "\55\55", "\53", "\55", "\52", "\57", "\46", "\174", "\136", "\45", 
-"\74\74", "\76\76", "\76\76\76", "\53\75", "\55\75", "\52\75", "\57\75", "\46\75", 
-"\174\75", "\136\75", "\56\75", "\45\75", "\74\74\75", "\76\76\75", "\41\75\75", 
-"\75\75\75", "\176\75", null, "\77\76", };
+"\50", "\51", "\173", "\175", "\133", "\135", "\73", "\54", "\56", "\100", "\44", 
+"\75", "\76", "\74", "\41", "\77", "\72", "\75\75", "\74\75", "\76\75", "\41\75", 
+"\174\174", "\46\46", "\53\53", "\55\55", "\53", "\55", "\52", "\57", "\46", "\174", 
+"\136", "\45", "\74\74", "\76\76", "\76\76\76", "\53\75", "\55\75", "\52\75", 
+"\57\75", "\46\75", "\174\75", "\136\75", "\56\75", "\45\75", "\74\74\75", "\76\76\75", 
+"\41\75\75", "\75\75\75", "\176\75", null, "\77\76", };
 public static final String[] lexStateNames = {
    "DEFAULT", 
    "PHPPARSING", 
@@ -1728,24 +1775,24 @@ public static final String[] lexStateNames = {
    "IN_MULTI_LINE_COMMENT", 
 };
 public static final int[] jjnewLexState = {
-   -1, 1, 0, -1, -1, -1, -1, -1, -1, 2, 3, 4, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+   -1, 1, 0, -1, -1, -1, -1, -1, -1, 2, 3, 4, 1, 0, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-   -1, -1, -1, -1, -1, 
+   -1, -1, -1, -1, -1, -1, -1, -1, 
 };
 static final long[] jjtoToken = {
-   0xffffffffffff0007L, 0xffffffffffffc7d1L, 0x3L, 
+   0xfffffffffffe2007L, 0xfffffffffffe3e8fL, 0x1fL, 
 };
 static final long[] jjtoSkip = {
-   0x71f8L, 0x0L, 0x0L, 
+   0xd1f8L, 0x0L, 0x0L, 
 };
 static final long[] jjtoSpecial = {
-   0x7000L, 0x0L, 0x0L, 
+   0xd000L, 0x0L, 0x0L, 
 };
 static final long[] jjtoMore = {
-   0x8e00L, 0x0L, 0x0L, 
+   0x10e00L, 0x0L, 0x0L, 
 };
 static protected SimpleCharStream input_stream;
 static private final int[] jjrounds = new int[64];
@@ -1863,27 +1910,27 @@ public static Token getNextToken()
          jjmatchedKind = 0x7fffffff;
          jjmatchedPos = 0;
          curPos = jjMoveStringLiteralDfa0_2();
-         if (jjmatchedPos == 0 && jjmatchedKind > 15)
+         if (jjmatchedPos == 0 && jjmatchedKind > 16)
          {
-            jjmatchedKind = 15;
+            jjmatchedKind = 16;
          }
          break;
        case 3:
          jjmatchedKind = 0x7fffffff;
          jjmatchedPos = 0;
          curPos = jjMoveStringLiteralDfa0_3();
-         if (jjmatchedPos == 0 && jjmatchedKind > 15)
+         if (jjmatchedPos == 0 && jjmatchedKind > 16)
          {
-            jjmatchedKind = 15;
+            jjmatchedKind = 16;
          }
          break;
        case 4:
          jjmatchedKind = 0x7fffffff;
          jjmatchedPos = 0;
          curPos = jjMoveStringLiteralDfa0_4();
-         if (jjmatchedPos == 0 && jjmatchedKind > 15)
+         if (jjmatchedPos == 0 && jjmatchedKind > 16)
          {
-            jjmatchedKind = 15;
+            jjmatchedKind = 16;
          }
          break;
      }