*** empty log message ***
authorkpouer <kpouer>
Thu, 27 Mar 2003 16:20:38 +0000 (16:20 +0000)
committerkpouer <kpouer>
Thu, 27 Mar 2003 16:20:38 +0000 (16:20 +0000)
net.sourceforge.phpeclipse/src/test/PHPParser.java
net.sourceforge.phpeclipse/src/test/PHPParser.jj
net.sourceforge.phpeclipse/src/test/PHPParserConstants.java
net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java

index dc5e797..d97225b 100644 (file)
@@ -833,7 +833,16 @@ final StringBuffer buff = new StringBuffer("(");
   static final public void MethodDeclaration() throws ParseException {
   final PHPFunctionDeclaration functionDeclaration;
     jj_consume_token(FUNCTION);
-    functionDeclaration = MethodDeclarator();
+    try {
+      functionDeclaration = MethodDeclarator();
+    } catch (ParseException e) {
+    if (errorMessage != null) {
+      {if (true) throw e;}
+    }
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function identifier expected";
+    errorLevel   = ERROR;
+    {if (true) throw e;}
+    }
     if (currentSegment != null) {
       currentSegment.add(functionDeclaration);
       currentSegment = functionDeclaration;
@@ -2244,8 +2253,8 @@ final StringBuffer buff = new StringBuffer();
         case SEMICOLON:
           jj_consume_token(SEMICOLON);
           break;
-        case 138:
-          jj_consume_token(138);
+        case 139:
+          jj_consume_token(139);
           break;
         default:
           jj_la1[72] = jj_gen;
@@ -2269,8 +2278,8 @@ final StringBuffer buff = new StringBuffer();
         case SEMICOLON:
           jj_consume_token(SEMICOLON);
           break;
-        case 138:
-          jj_consume_token(138);
+        case 139:
+          jj_consume_token(139);
           break;
         default:
           jj_la1[73] = jj_gen;
@@ -2294,8 +2303,8 @@ final StringBuffer buff = new StringBuffer();
         case SEMICOLON:
           jj_consume_token(SEMICOLON);
           break;
-        case 138:
-          jj_consume_token(138);
+        case 139:
+          jj_consume_token(139);
           break;
         default:
           jj_la1[74] = jj_gen;
@@ -2319,8 +2328,8 @@ final StringBuffer buff = new StringBuffer();
         case SEMICOLON:
           jj_consume_token(SEMICOLON);
           break;
-        case 138:
-          jj_consume_token(138);
+        case 139:
+          jj_consume_token(139);
           break;
         default:
           jj_la1[75] = jj_gen;
@@ -2430,8 +2439,8 @@ final StringBuffer buff = new StringBuffer();
       case SEMICOLON:
         jj_consume_token(SEMICOLON);
         break;
-      case 138:
-        jj_consume_token(138);
+      case 139:
+        jj_consume_token(139);
         break;
       default:
         jj_la1[81] = jj_gen;
@@ -2466,8 +2475,8 @@ final StringBuffer buff = new StringBuffer();
       case SEMICOLON:
         jj_consume_token(SEMICOLON);
         break;
-      case 138:
-        jj_consume_token(138);
+      case 139:
+        jj_consume_token(139);
         break;
       default:
         jj_la1[83] = jj_gen;
@@ -2502,8 +2511,8 @@ final StringBuffer buff = new StringBuffer();
       case SEMICOLON:
         jj_consume_token(SEMICOLON);
         break;
-      case 138:
-        jj_consume_token(138);
+      case 139:
+        jj_consume_token(139);
         break;
       default:
         jj_la1[85] = jj_gen;
@@ -3372,8 +3381,8 @@ final StringBuffer buff = new StringBuffer();
         case SEMICOLON:
           jj_consume_token(SEMICOLON);
           break;
-        case 138:
-          jj_consume_token(138);
+        case 139:
+          jj_consume_token(139);
           break;
         default:
           jj_la1[107] = jj_gen;
@@ -3444,8 +3453,8 @@ final StringBuffer buff = new StringBuffer();
       case SEMICOLON:
         jj_consume_token(SEMICOLON);
         break;
-      case 138:
-        jj_consume_token(138);
+      case 139:
+        jj_consume_token(139);
         break;
       default:
         jj_la1[109] = jj_gen;
@@ -3885,25 +3894,15 @@ final int pos = jj_input_stream.bufpos;
     return retval;
   }
 
-  static final private boolean jj_3R_116() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_119()) {
-    jj_scanpos = xsp;
-    if (jj_3R_120()) {
-    jj_scanpos = xsp;
-    if (jj_3R_121()) {
-    jj_scanpos = xsp;
-    if (jj_3R_122()) {
-    jj_scanpos = xsp;
-    if (jj_3R_123()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_115()) return true;
+  static final private boolean jj_3R_196() {
+    if (jj_3R_41()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_197()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
     return false;
   }
 
@@ -3927,26 +3926,6 @@ final int pos = jj_input_stream.bufpos;
     return false;
   }
 
-  static final private boolean jj_3R_113() {
-    if (jj_3R_115()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_116()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
-    return false;
-  }
-
-  static final private boolean jj_3R_197() {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_41()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
   static final private boolean jj_3R_70() {
     if (jj_scan_token(LBRACE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -3974,13 +3953,27 @@ final int pos = jj_input_stream.bufpos;
     return false;
   }
 
-  static final private boolean jj_3R_196() {
-    if (jj_3R_41()) return true;
+  static final private boolean jj_3R_114() {
+    if (jj_scan_token(BIT_AND)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_113()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_194() {
+    if (jj_3R_196()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_111() {
+    if (jj_3R_113()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_197()) { jj_scanpos = xsp; break; }
+      if (jj_3R_114()) { jj_scanpos = xsp; break; }
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
@@ -3994,16 +3987,14 @@ final int pos = jj_input_stream.bufpos;
     return false;
   }
 
-  static final private boolean jj_3R_114() {
-    if (jj_scan_token(BIT_AND)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_113()) return true;
+  static final private boolean jj_3R_192() {
+    if (jj_scan_token(LPAREN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_194() {
-    if (jj_3R_196()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_194()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_scan_token(RPAREN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
@@ -4029,36 +4020,6 @@ final int pos = jj_input_stream.bufpos;
     return false;
   }
 
-  static final private boolean jj_3R_111() {
-    if (jj_3R_113()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_114()) { 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_scan_token(LPAREN)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_194()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(RPAREN)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3_1() {
-    if (jj_3R_38()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
   static final private boolean jj_3R_112() {
     if (jj_scan_token(XOR)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -4073,18 +4034,6 @@ final int pos = jj_input_stream.bufpos;
     return false;
   }
 
-  static final private boolean jj_3R_68() {
-    if (jj_3R_77()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3_1()) { jj_scanpos = xsp; break; }
-      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    }
-    return false;
-  }
-
   static final private boolean jj_3R_107() {
     if (jj_3R_111()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -4103,6 +4052,12 @@ final int pos = jj_input_stream.bufpos;
     return false;
   }
 
+  static final private boolean jj_3_1() {
+    if (jj_3R_38()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
   static final private boolean jj_3R_181() {
     if (jj_scan_token(TRUE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -4120,6 +4075,18 @@ final int pos = jj_input_stream.bufpos;
     return false;
   }
 
+  static final private boolean jj_3R_68() {
+    if (jj_3R_77()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_1()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
+    return false;
+  }
+
   static final private boolean jj_3R_170() {
     if (jj_3R_175()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -5133,28 +5100,16 @@ final int pos = jj_input_stream.bufpos;
     return false;
   }
 
-  static final private boolean jj_3_2() {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_39()) return true;
+  static final private boolean jj_3R_133() {
+    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_193() {
-    if (jj_3R_39()) return true;
+  static final private boolean jj_3_2() {
+    if (jj_scan_token(COMMA)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    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_133() {
-    if (jj_scan_token(RSIGNEDSHIFT)) return true;
+    if (jj_3R_39()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
@@ -5184,15 +5139,15 @@ final int pos = jj_input_stream.bufpos;
     return false;
   }
 
-  static final private boolean jj_3R_185() {
-    if (jj_scan_token(LPAREN)) return true;
+  static final private boolean jj_3R_193() {
+    if (jj_3R_39()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_193()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(RPAREN)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    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;
   }
 
@@ -5208,21 +5163,15 @@ final int pos = jj_input_stream.bufpos;
     return false;
   }
 
-  static final private boolean jj_3R_195() {
-    if (jj_scan_token(ARRAYASSIGN)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_41()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
-  static final private boolean jj_3R_39() {
-    if (jj_3R_41()) return true;
+  static final private boolean jj_3R_185() {
+    if (jj_scan_token(LPAREN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_195()) jj_scanpos = xsp;
+    if (jj_3R_193()) jj_scanpos = xsp;
     else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_scan_token(RPAREN)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
@@ -5254,6 +5203,14 @@ final int pos = jj_input_stream.bufpos;
     return false;
   }
 
+  static final private boolean jj_3R_195() {
+    if (jj_scan_token(ARRAYASSIGN)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_41()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
   static final private boolean jj_3R_117() {
     if (jj_3R_124()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -5266,14 +5223,18 @@ final int pos = jj_input_stream.bufpos;
     return false;
   }
 
-  static final private boolean jj_3R_43() {
-    if (jj_scan_token(PHPEND)) return true;
+  static final private boolean jj_3R_39() {
+    if (jj_3R_41()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_195()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_110() {
-    if (jj_3R_62()) return true;
+  static final private boolean jj_3R_43() {
+    if (jj_scan_token(PHPEND)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
@@ -5327,12 +5288,8 @@ final int pos = jj_input_stream.bufpos;
     return false;
   }
 
-  static final private boolean jj_3R_109() {
-    if (jj_scan_token(LBRACE)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_41()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_scan_token(RBRACE)) return true;
+  static final private boolean jj_3R_110() {
+    if (jj_3R_62()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
@@ -5350,13 +5307,13 @@ final int pos = jj_input_stream.bufpos;
     return false;
   }
 
-  static final private boolean jj_3R_73() {
-    if (jj_scan_token(DOLLAR_ID)) return true;
+  static final private boolean jj_3R_109() {
+    if (jj_scan_token(LBRACE)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_41()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_scan_token(RBRACE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_110()) jj_scanpos = xsp;
-    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
@@ -5372,14 +5329,6 @@ final int pos = jj_input_stream.bufpos;
     return false;
   }
 
-  static final private boolean jj_3R_72() {
-    if (jj_scan_token(DOLLAR)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_62()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
   static final private boolean jj_3R_121() {
     if (jj_scan_token(NE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -5398,6 +5347,66 @@ final int pos = jj_input_stream.bufpos;
     return false;
   }
 
+  static final private boolean jj_3R_116() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_119()) {
+    jj_scanpos = xsp;
+    if (jj_3R_120()) {
+    jj_scanpos = xsp;
+    if (jj_3R_121()) {
+    jj_scanpos = xsp;
+    if (jj_3R_122()) {
+    jj_scanpos = xsp;
+    if (jj_3R_123()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_115()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_73() {
+    if (jj_scan_token(DOLLAR_ID)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_110()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_113() {
+    if (jj_3R_115()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_116()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    }
+    return false;
+  }
+
+  static final private boolean jj_3R_197() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_41()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  static final private boolean jj_3R_72() {
+    if (jj_scan_token(DOLLAR)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_62()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
   static private boolean jj_initialized_once = false;
   static public PHPParserTokenManager token_source;
   static SimpleCharStream jj_input_stream;
@@ -5422,19 +5431,19 @@ final int pos = jj_input_stream.bufpos;
       jj_la1_4();
    }
    private static void jj_la1_0() {
-      jj_la1_0 = new int[] {0xfe58001e,0x0,0x6,0x6,0xfe58001e,0xfe580000,0x0,0x300000,0x300000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0xa000000,0x0,0x0,0x0,0x0,0x0,0x0,0xa000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0x2000000,0x0,0x2000000,0x0,0x0,0x0,0x0,0x2000000,0x0,0x0,0x0,0xa000000,0x0,0x0,0x0,0xa000000,0x0,0x10,0x0,0xf2400000,0xfe400000,0x0,0x0,0x0,0x0,0xe0000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfe580000,0xfe580000,0xfa580000,0x0,0x0,0x0,0x0,0x2000000,0x0,0xfa580000,0x4000000,0x0,0xfe400000,0x800000,0x1000000,0x800000,0x1000000,0xfe400000,0xfe400000,0xfe400000,0xfe400000,0x0,0xfe400000,0x0,0x0,0x0,0x2000000,0xa000000,0x2000000,0xfe400000,0xfe400000,0x2000000,0x0,0x0,0x0,0xa000000,};
+      jj_la1_0 = new int[] {0xfcb0001e,0x0,0x6,0x6,0xfcb0001e,0xfcb00000,0x0,0x600000,0x600000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x0,0x14000000,0x0,0x0,0x0,0x0,0x0,0x0,0x14000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x0,0x4000000,0x0,0x4000000,0x0,0x0,0x0,0x0,0x4000000,0x0,0x0,0x0,0x14000000,0x0,0x0,0x0,0x14000000,0x0,0x10,0x0,0xe4800000,0xfc800000,0x0,0x0,0x0,0x0,0xc0000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfcb00000,0xfcb00000,0xf4b00000,0x0,0x0,0x0,0x0,0x4000000,0x0,0xf4b00000,0x8000000,0x0,0xfc800000,0x1000000,0x2000000,0x1000000,0x2000000,0xfc800000,0xfc800000,0xfc800000,0xfc800000,0x0,0xfc800000,0x0,0x0,0x0,0x4000000,0x14000000,0x4000000,0xfc800000,0xfc800000,0x4000000,0x0,0x0,0x0,0x14000000,};
    }
    private static void jj_la1_1() {
-      jj_la1_1 = new int[] {0x8ebaa47,0x0,0x0,0x0,0x8ebaa47,0x8ebaa47,0x1000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x610000,0x20,0x618040,0x0,0x0,0x0,0x0,0xe0000000,0x0,0x618040,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x618000,0x0,0x618000,0x0,0x618000,0x0,0x0,0x8,0x8,0x8000,0x8000,0x0,0x8,0x618040,0x8,0x610000,0x600000,0x618040,0x0,0x0,0x0,0x88aaa07,0x8ebaa47,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8ebaa47,0x8ebaa47,0x8ebaa47,0x0,0x0,0x0,0x0,0x8000,0x480,0x8ebaa47,0x0,0x480,0x8ebaa47,0x0,0x0,0x0,0x0,0x8ebaa47,0x8ebaa47,0x8ebaa47,0x8ebaa47,0x0,0x8ebaa47,0x0,0x8,0x20,0x8000,0x618040,0x8000,0x8ebaa47,0x8ebaa47,0x8000,0x0,0x0,0x0,0x618040,};
+      jj_la1_1 = new int[] {0x11d7548f,0x0,0x0,0x0,0x11d7548f,0x11d7548f,0x2000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc20000,0x40,0xc30080,0x0,0x0,0x0,0x0,0xc0000000,0x0,0xc30080,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc30000,0x0,0xc30000,0x0,0xc30000,0x0,0x0,0x10,0x10,0x10000,0x10000,0x0,0x10,0xc30080,0x10,0xc20000,0xc00000,0xc30080,0x0,0x0,0x0,0x1115540f,0x11d7548f,0x0,0x0,0x0,0x0,0x3,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x11d7548f,0x11d7548f,0x11d7548f,0x0,0x0,0x0,0x0,0x10000,0x900,0x11d7548f,0x0,0x900,0x11d7548f,0x0,0x0,0x0,0x0,0x11d7548f,0x11d7548f,0x11d7548f,0x11d7548f,0x0,0x11d7548f,0x0,0x10,0x40,0x10000,0xc30080,0x10000,0x11d7548f,0x11d7548f,0x10000,0x0,0x0,0x0,0xc30080,};
    }
    private static void jj_la1_2() {
-      jj_la1_2 = new int[] {0x11445100,0x10000000,0x0,0x0,0x11445100,0x11445100,0x0,0x0,0x0,0x20000000,0x0,0x1000000,0x0,0x1000000,0x1040000,0x1040000,0x1100,0x1100,0x45100,0x0,0x445100,0x0,0x20000000,0x0,0x0,0x3f,0x0,0x445100,0x0,0x0,0x40,0x40,0x80,0x80,0x40000000,0x0,0x0,0x0,0x0,0x0,0x80000000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x445100,0x0,0x445100,0x0,0x445100,0x0,0x0,0x4400000,0x4400000,0x40000,0x40000,0x40000,0x4400000,0x445100,0x4000000,0x5100,0x0,0x445100,0x20000000,0x10000000,0x0,0x11040000,0x11445100,0x10000000,0x10000000,0x10000000,0x10000000,0x0,0x0,0x20000000,0x0,0x20000000,0x10000000,0x20000000,0x10000000,0x20000000,0x10000000,0x11445100,0x11445100,0x11445100,0x20000000,0x0,0x0,0x0,0x40000,0x0,0x11445100,0x0,0x0,0x11445100,0x0,0x0,0x0,0x0,0x11445100,0x11445100,0x11445100,0x11445100,0x10000000,0x11445100,0x10000000,0x4000000,0x0,0x40000,0x445100,0x40000,0x11445100,0x11445100,0x40000,0x20000000,0x40000,0x40000,0x445100,};
+      jj_la1_2 = new int[] {0x2288a200,0x20000000,0x0,0x0,0x2288a200,0x2288a200,0x0,0x0,0x0,0x40000000,0x0,0x2000000,0x0,0x2000000,0x2080000,0x2080000,0x2200,0x2200,0x8a200,0x0,0x88a200,0x0,0x40000000,0x0,0x0,0x7f,0x0,0x88a200,0x0,0x0,0x80,0x80,0x100,0x100,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x88a200,0x0,0x88a200,0x0,0x88a200,0x0,0x0,0x8800000,0x8800000,0x80000,0x80000,0x80000,0x8800000,0x88a200,0x8000000,0xa200,0x0,0x88a200,0x40000000,0x20000000,0x0,0x22080000,0x2288a200,0x20000000,0x20000000,0x20000000,0x20000000,0x0,0x0,0x40000000,0x0,0x40000000,0x20000000,0x40000000,0x20000000,0x40000000,0x20000000,0x2288a200,0x2288a200,0x2288a200,0x40000000,0x0,0x0,0x0,0x80000,0x0,0x2288a200,0x0,0x0,0x2288a200,0x0,0x0,0x0,0x0,0x2288a200,0x2288a200,0x2288a200,0x2288a200,0x20000000,0x2288a200,0x20000000,0x8000000,0x0,0x80000,0x88a200,0x80000,0x2288a200,0x2288a200,0x80000,0x40000000,0x80000,0x80000,0x88a200,};
    }
    private static void jj_la1_3() {
-      jj_la1_3 = new int[] {0x3c380000,0x0,0x0,0x0,0x3c380000,0x3c380000,0x0,0x0,0x0,0x0,0x100,0x0,0x100000,0x0,0x100000,0x100000,0x0,0x0,0x30000000,0x0,0x3c380000,0x0,0x0,0x100000,0x0,0x0,0x7ff00,0x3c380000,0x7ff00,0x400000,0x1000000,0x1000000,0x2000000,0x2000000,0x0,0x0,0x0,0x0,0xf2,0xf2,0xd,0xd,0x0,0x0,0x30000000,0x30000000,0xc0000000,0xc0000000,0x80000,0x3c380000,0x30000000,0x3c300000,0x200000,0x100000,0xc000000,0xc000000,0x0,0x0,0x100000,0x100000,0x100000,0x0,0x3c380000,0x0,0x0,0x0,0x3c380000,0x0,0x0,0x80000,0xc180000,0x3c380000,0x0,0x0,0x0,0x0,0x0,0x100000,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x3c380000,0x3c380000,0x3c380000,0x0,0x100,0xc07ff00,0xc07ff00,0xc100000,0x0,0x3c380000,0x0,0x0,0x3c380000,0x0,0x0,0x0,0x0,0x3cb80000,0x3c380000,0x3c380000,0x3c380000,0x0,0x3cb80000,0x0,0x0,0x0,0xc100000,0x3c380000,0xc100000,0x3c380000,0x3cb80000,0xc100000,0x0,0x0,0x0,0x3c380000,};
+      jj_la1_3 = new int[] {0x78700000,0x0,0x0,0x0,0x78700000,0x78700000,0x0,0x0,0x0,0x0,0x200,0x0,0x200000,0x0,0x200000,0x200000,0x0,0x0,0x60000000,0x0,0x78700000,0x0,0x0,0x200000,0x0,0x0,0xffe00,0x78700000,0xffe00,0x800000,0x2000000,0x2000000,0x4000000,0x4000000,0x0,0x0,0x0,0x0,0x1e4,0x1e4,0x1b,0x1b,0x0,0x0,0x60000000,0x60000000,0x80000000,0x80000000,0x100000,0x78700000,0x60000000,0x78600000,0x400000,0x200000,0x18000000,0x18000000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x78700000,0x0,0x0,0x0,0x78700000,0x0,0x0,0x100000,0x18300000,0x78700000,0x0,0x0,0x0,0x0,0x0,0x200000,0x0,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x78700000,0x78700000,0x78700000,0x0,0x200,0x180ffe00,0x180ffe00,0x18200000,0x0,0x78700000,0x0,0x0,0x78700000,0x0,0x0,0x0,0x0,0x79700000,0x78700000,0x78700000,0x78700000,0x0,0x79700000,0x0,0x0,0x0,0x18200000,0x78700000,0x18200000,0x78700000,0x79700000,0x18200000,0x0,0x0,0x0,0x78700000,};
    }
    private static void jj_la1_4() {
-      jj_la1_4 = new int[] {0x201,0x0,0x0,0x0,0x201,0x201,0x0,0x0,0x0,0x0,0x0,0x0,0x200,0x0,0x200,0x200,0x0,0x0,0x0,0x0,0x201,0x1,0x0,0x201,0x1,0x0,0x180,0x201,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x4,0x1,0x0,0x0,0x0,0x0,0x70,0x70,0x0,0x0,0x8,0x8,0x0,0x201,0x0,0x200,0x0,0x200,0x0,0x0,0x0,0x0,0x200,0x200,0x200,0x0,0x201,0x0,0x0,0x0,0x201,0x0,0x0,0x0,0x200,0x201,0x400,0x400,0x400,0x400,0x0,0x200,0x0,0x0,0x0,0x400,0x0,0x400,0x0,0x400,0x201,0x201,0x201,0x0,0x0,0x180,0x180,0x200,0x0,0x201,0x0,0x0,0x201,0x0,0x0,0x0,0x0,0x201,0x201,0x201,0x201,0x400,0x201,0x400,0x0,0x0,0x200,0x201,0x200,0x201,0x201,0x200,0x0,0x0,0x0,0x201,};
+      jj_la1_4 = new int[] {0x402,0x0,0x0,0x0,0x402,0x402,0x0,0x0,0x0,0x0,0x0,0x0,0x400,0x0,0x400,0x400,0x0,0x0,0x0,0x0,0x402,0x2,0x0,0x402,0x2,0x0,0x300,0x402,0x300,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x8,0x2,0x0,0x0,0x0,0x0,0xe0,0xe0,0x0,0x0,0x11,0x11,0x0,0x402,0x0,0x400,0x0,0x400,0x0,0x0,0x0,0x0,0x400,0x400,0x400,0x0,0x402,0x0,0x0,0x0,0x402,0x0,0x0,0x0,0x400,0x402,0x800,0x800,0x800,0x800,0x0,0x400,0x0,0x0,0x0,0x800,0x0,0x800,0x0,0x800,0x402,0x402,0x402,0x0,0x0,0x300,0x300,0x400,0x0,0x402,0x0,0x0,0x402,0x0,0x0,0x0,0x0,0x402,0x402,0x402,0x402,0x800,0x402,0x800,0x0,0x0,0x400,0x402,0x400,0x402,0x402,0x400,0x0,0x0,0x0,0x402,};
    }
   static final private JJCalls[] jj_2_rtns = new JJCalls[7];
   static private boolean jj_rescan = false;
@@ -5622,8 +5631,8 @@ final int pos = jj_input_stream.bufpos;
 
   static public ParseException generateParseException() {
     jj_expentries.removeAllElements();
-    boolean[] la1tokens = new boolean[139];
-    for (int i = 0; i < 139; i++) {
+    boolean[] la1tokens = new boolean[140];
+    for (int i = 0; i < 140; i++) {
       la1tokens[i] = false;
     }
     if (jj_kind >= 0) {
@@ -5651,7 +5660,7 @@ final int pos = jj_input_stream.bufpos;
         }
       }
     }
-    for (int i = 0; i < 139; i++) {
+    for (int i = 0; i < 140; i++) {
       if (la1tokens[i]) {
         jj_expentry = new int[1];
         jj_expentry[0] = i;
index 9327af8..21cdb6f 100644 (file)
@@ -280,7 +280,7 @@ PARSER_END(PHPParser)
 
 <PHPPARSING> SPECIAL_TOKEN :
 {
-  "//" : IN_SINGLE_LINE_COMMENT
+  "//" | "#" : IN_SINGLE_LINE_COMMENT
 |
   <"/**" ~["/"]> { input_stream.backup(1); } : IN_FORMAL_COMMENT
 |
@@ -832,7 +832,17 @@ void MethodDeclaration() :
   final PHPFunctionDeclaration functionDeclaration;
 }
 {
-  <FUNCTION> functionDeclaration = MethodDeclarator()
+  <FUNCTION>
+  try {
+    functionDeclaration = MethodDeclarator()
+  } catch (ParseException e) {
+    if (errorMessage != null) {
+      throw e;
+    }
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function identifier expected";
+    errorLevel   = ERROR;
+    throw e;
+  }
   {
     if (currentSegment != null) {
       currentSegment.add(functionDeclaration);
index f83035d..eeb62cf 100644 (file)
@@ -8,129 +8,129 @@ public interface PHPParserConstants {
   int PHPSTARTLONG = 2;
   int PHPECHOSTART = 3;
   int PHPEND = 4;
-  int SINGLE_LINE_COMMENT = 14;
-  int SINGLE_LINE_COMMENT_PHPEND = 15;
-  int FORMAL_COMMENT = 16;
-  int MULTI_LINE_COMMENT = 17;
-  int CLASS = 19;
-  int FUNCTION = 20;
-  int VAR = 21;
-  int IF = 22;
-  int ELSEIF = 23;
-  int ELSE = 24;
-  int ARRAY = 25;
-  int BREAK = 26;
-  int PRINT = 27;
-  int ECHO = 28;
-  int INCLUDE = 29;
-  int REQUIRE = 30;
-  int INCLUDE_ONCE = 31;
-  int REQUIRE_ONCE = 32;
-  int GLOBAL = 33;
-  int STATIC = 34;
-  int CLASSACCESS = 35;
-  int STATICCLASSACCESS = 36;
-  int ARRAYASSIGN = 37;
-  int LIST = 38;
-  int CASE = 39;
-  int CONST = 40;
-  int CONTINUE = 41;
-  int _DEFAULT = 42;
-  int DO = 43;
-  int EXTENDS = 44;
-  int FOR = 45;
-  int GOTO = 46;
-  int NEW = 47;
-  int NULL = 48;
-  int RETURN = 49;
-  int SUPER = 50;
-  int SWITCH = 51;
-  int THIS = 52;
-  int TRUE = 53;
-  int FALSE = 54;
-  int WHILE = 55;
-  int ENDWHILE = 56;
-  int ENDIF = 57;
-  int ENDFOR = 58;
-  int FOREACH = 59;
-  int AS = 60;
-  int STRING = 61;
-  int OBJECT = 62;
-  int BOOL = 63;
-  int BOOLEAN = 64;
-  int REAL = 65;
-  int DOUBLE = 66;
-  int FLOAT = 67;
-  int INT = 68;
-  int INTEGER = 69;
-  int _ORL = 70;
-  int _ANDL = 71;
-  int INTEGER_LITERAL = 72;
-  int DECIMAL_LITERAL = 73;
-  int HEX_LITERAL = 74;
-  int OCTAL_LITERAL = 75;
-  int FLOATING_POINT_LITERAL = 76;
-  int EXPONENT = 77;
-  int STRING_LITERAL = 78;
-  int STRING_1 = 79;
-  int STRING_2 = 80;
-  int STRING_3 = 81;
-  int IDENTIFIER = 82;
-  int LETTER = 83;
-  int DIGIT = 84;
-  int SPECIAL = 85;
-  int LPAREN = 86;
-  int RPAREN = 87;
-  int LBRACE = 88;
-  int RBRACE = 89;
-  int LBRACKET = 90;
-  int RBRACKET = 91;
-  int SEMICOLON = 92;
-  int COMMA = 93;
-  int DOT = 94;
-  int GT = 95;
-  int LT = 96;
-  int EQ = 97;
-  int LE = 98;
-  int GE = 99;
-  int NE = 100;
-  int DIF = 101;
-  int BANGDOUBLEEQUAL = 102;
-  int TRIPLEEQUAL = 103;
-  int ASSIGN = 104;
-  int PLUSASSIGN = 105;
-  int MINUSASSIGN = 106;
-  int STARASSIGN = 107;
-  int SLASHASSIGN = 108;
-  int ANDASSIGN = 109;
-  int ORASSIGN = 110;
-  int XORASSIGN = 111;
-  int DOTASSIGN = 112;
-  int REMASSIGN = 113;
-  int TILDEEQUAL = 114;
-  int AT = 115;
-  int DOLLAR = 116;
-  int BANG = 117;
-  int HOOK = 118;
-  int COLON = 119;
-  int SC_OR = 120;
-  int SC_AND = 121;
-  int INCR = 122;
-  int DECR = 123;
-  int PLUS = 124;
-  int MINUS = 125;
-  int STAR = 126;
-  int SLASH = 127;
-  int BIT_AND = 128;
-  int BIT_OR = 129;
-  int XOR = 130;
-  int REM = 131;
-  int LSHIFT = 132;
-  int RSIGNEDSHIFT = 133;
-  int RUNSIGNEDSHIFT = 134;
-  int LSHIFTASSIGN = 135;
-  int RSIGNEDSHIFTASSIGN = 136;
-  int DOLLAR_ID = 137;
+  int SINGLE_LINE_COMMENT = 15;
+  int SINGLE_LINE_COMMENT_PHPEND = 16;
+  int FORMAL_COMMENT = 17;
+  int MULTI_LINE_COMMENT = 18;
+  int CLASS = 20;
+  int FUNCTION = 21;
+  int VAR = 22;
+  int IF = 23;
+  int ELSEIF = 24;
+  int ELSE = 25;
+  int ARRAY = 26;
+  int BREAK = 27;
+  int PRINT = 28;
+  int ECHO = 29;
+  int INCLUDE = 30;
+  int REQUIRE = 31;
+  int INCLUDE_ONCE = 32;
+  int REQUIRE_ONCE = 33;
+  int GLOBAL = 34;
+  int STATIC = 35;
+  int CLASSACCESS = 36;
+  int STATICCLASSACCESS = 37;
+  int ARRAYASSIGN = 38;
+  int LIST = 39;
+  int CASE = 40;
+  int CONST = 41;
+  int CONTINUE = 42;
+  int _DEFAULT = 43;
+  int DO = 44;
+  int EXTENDS = 45;
+  int FOR = 46;
+  int GOTO = 47;
+  int NEW = 48;
+  int NULL = 49;
+  int RETURN = 50;
+  int SUPER = 51;
+  int SWITCH = 52;
+  int THIS = 53;
+  int TRUE = 54;
+  int FALSE = 55;
+  int WHILE = 56;
+  int ENDWHILE = 57;
+  int ENDIF = 58;
+  int ENDFOR = 59;
+  int FOREACH = 60;
+  int AS = 61;
+  int STRING = 62;
+  int OBJECT = 63;
+  int BOOL = 64;
+  int BOOLEAN = 65;
+  int REAL = 66;
+  int DOUBLE = 67;
+  int FLOAT = 68;
+  int INT = 69;
+  int INTEGER = 70;
+  int _ORL = 71;
+  int _ANDL = 72;
+  int INTEGER_LITERAL = 73;
+  int DECIMAL_LITERAL = 74;
+  int HEX_LITERAL = 75;
+  int OCTAL_LITERAL = 76;
+  int FLOATING_POINT_LITERAL = 77;
+  int EXPONENT = 78;
+  int STRING_LITERAL = 79;
+  int STRING_1 = 80;
+  int STRING_2 = 81;
+  int STRING_3 = 82;
+  int IDENTIFIER = 83;
+  int LETTER = 84;
+  int DIGIT = 85;
+  int SPECIAL = 86;
+  int LPAREN = 87;
+  int RPAREN = 88;
+  int LBRACE = 89;
+  int RBRACE = 90;
+  int LBRACKET = 91;
+  int RBRACKET = 92;
+  int SEMICOLON = 93;
+  int COMMA = 94;
+  int DOT = 95;
+  int GT = 96;
+  int LT = 97;
+  int EQ = 98;
+  int LE = 99;
+  int GE = 100;
+  int NE = 101;
+  int DIF = 102;
+  int BANGDOUBLEEQUAL = 103;
+  int TRIPLEEQUAL = 104;
+  int ASSIGN = 105;
+  int PLUSASSIGN = 106;
+  int MINUSASSIGN = 107;
+  int STARASSIGN = 108;
+  int SLASHASSIGN = 109;
+  int ANDASSIGN = 110;
+  int ORASSIGN = 111;
+  int XORASSIGN = 112;
+  int DOTASSIGN = 113;
+  int REMASSIGN = 114;
+  int TILDEEQUAL = 115;
+  int AT = 116;
+  int DOLLAR = 117;
+  int BANG = 118;
+  int HOOK = 119;
+  int COLON = 120;
+  int SC_OR = 121;
+  int SC_AND = 122;
+  int INCR = 123;
+  int DECR = 124;
+  int PLUS = 125;
+  int MINUS = 126;
+  int STAR = 127;
+  int SLASH = 128;
+  int BIT_AND = 129;
+  int BIT_OR = 130;
+  int XOR = 131;
+  int REM = 132;
+  int LSHIFT = 133;
+  int RSIGNEDSHIFT = 134;
+  int RUNSIGNEDSHIFT = 135;
+  int LSHIFTASSIGN = 136;
+  int RSIGNEDSHIFTASSIGN = 137;
+  int DOLLAR_ID = 138;
 
   int DEFAULT = 0;
   int PHPPARSING = 1;
@@ -151,13 +151,14 @@ public interface PHPParserConstants {
     "\"\\r\"",
     "\"\\f\"",
     "\"//\"",
-    "<token of kind 12>",
+    "\"#\"",
+    "<token of kind 13>",
     "\"/*\"",
     "<SINGLE_LINE_COMMENT>",
     "\"?>\"",
     "\"*/\"",
     "\"*/\"",
-    "<token of kind 18>",
+    "<token of kind 19>",
     "\"class\"",
     "\"function\"",
     "\"var\"",
index a5546f7..f1f3fc9 100644 (file)
@@ -34,7 +34,7 @@ static private final int jjMoveStringLiteralDfa0_0()
       case 60:
          return jjMoveStringLiteralDfa1_0(0xeL, 0x0L);
       case 63:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x400L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x800L);
       default :
          return 1;
    }
@@ -48,8 +48,8 @@ static private final int jjMoveStringLiteralDfa1_0(long active0, long active2)
    switch(curChar)
    {
       case 62:
-         if ((active2 & 0x400L) != 0L)
-            return jjStopAtPos(1, 138);
+         if ((active2 & 0x800L) != 0L)
+            return jjStopAtPos(1, 139);
          break;
       case 63:
          if ((active0 & 0x2L) != 0L)
@@ -127,7 +127,7 @@ static private final int jjMoveStringLiteralDfa0_4()
    switch(curChar)
    {
       case 42:
-         return jjMoveStringLiteralDfa1_4(0x20000L);
+         return jjMoveStringLiteralDfa1_4(0x40000L);
       default :
          return 1;
    }
@@ -141,8 +141,8 @@ static private final int jjMoveStringLiteralDfa1_4(long active0)
    switch(curChar)
    {
       case 47:
-         if ((active0 & 0x20000L) != 0L)
-            return jjStopAtPos(1, 17);
+         if ((active0 & 0x40000L) != 0L)
+            return jjStopAtPos(1, 18);
          break;
       default :
          return 2;
@@ -174,7 +174,7 @@ static private final int jjMoveStringLiteralDfa0_2()
    switch(curChar)
    {
       case 63:
-         return jjMoveStringLiteralDfa1_2(0x8000L);
+         return jjMoveStringLiteralDfa1_2(0x10000L);
       default :
          return jjMoveNfa_2(0, 0);
    }
@@ -189,8 +189,8 @@ static private final int jjMoveStringLiteralDfa1_2(long active0)
    switch(curChar)
    {
       case 62:
-         if ((active0 & 0x8000L) != 0L)
-            return jjStopAtPos(1, 15);
+         if ((active0 & 0x10000L) != 0L)
+            return jjStopAtPos(1, 16);
          break;
       default :
          break;
@@ -249,15 +249,15 @@ static private final int jjMoveNfa_2(int startState, int curPos)
                case 0:
                   if ((0x2400L & l) != 0L)
                   {
-                     if (kind > 14)
-                        kind = 14;
+                     if (kind > 15)
+                        kind = 15;
                   }
                   if (curChar == 13)
                      jjstateSet[jjnewStateCnt++] = 1;
                   break;
                case 1:
-                  if (curChar == 10 && kind > 14)
-                     kind = 14;
+                  if (curChar == 10 && kind > 15)
+                     kind = 15;
                   break;
                case 2:
                   if (curChar == 13)
@@ -308,122 +308,122 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac
    switch (pos)
    {
       case 0:
-         if ((active0 & 0x2800L) != 0L || (active1 & 0x8000100000000000L) != 0L)
+         if ((active0 & 0x4800L) != 0L || (active1 & 0x200000000000L) != 0L || (active2 & 0x1L) != 0L)
             return 2;
-         if ((active1 & 0x10000000000000L) != 0L)
+         if ((active1 & 0x20000000000000L) != 0L)
             return 16;
-         if ((active1 & 0x1000040000000L) != 0L)
+         if ((active1 & 0x2000080000000L) != 0L)
             return 8;
-         if ((active0 & 0xffffffc7fff80000L) != 0L || (active1 & 0xffL) != 0L)
+         if ((active0 & 0xffffff8ffff00000L) != 0L || (active1 & 0x1ffL) != 0L)
          {
-            jjmatchedKind = 82;
+            jjmatchedKind = 83;
             return 14;
          }
          return -1;
       case 1:
-         if ((active0 & 0x2000L) != 0L)
-            return 0;
-         if ((active0 & 0x1000080000400000L) != 0L || (active1 & 0x44L) != 0L)
-            return 14;
-         if ((active0 & 0xeffff7c7ffb80000L) != 0L || (active1 & 0xbbL) != 0L)
+         if ((active0 & 0xdfffef8fff700000L) != 0L || (active1 & 0x177L) != 0L)
          {
             if (jjmatchedPos != 1)
             {
-               jjmatchedKind = 82;
+               jjmatchedKind = 83;
                jjmatchedPos = 1;
             }
             return 14;
          }
+         if ((active0 & 0x4000L) != 0L)
+            return 0;
+         if ((active0 & 0x2000100000800000L) != 0L || (active1 & 0x88L) != 0L)
+            return 14;
          return -1;
       case 2:
-         if ((active0 & 0x800a00000200000L) != 0L || (active1 & 0xb0L) != 0L)
+         if ((active0 & 0x1001400000400000L) != 0L || (active1 & 0x160L) != 0L)
             return 14;
-         if ((active0 & 0xe7ff57c7ff980000L) != 0L || (active1 & 0xfL) != 0L)
+         if ((active0 & 0xcffeaf8fff300000L) != 0L || (active1 & 0x1fL) != 0L)
          {
             if (jjmatchedPos != 2)
             {
-               jjmatchedKind = 82;
+               jjmatchedKind = 83;
                jjmatchedPos = 2;
             }
             return 14;
          }
          return -1;
       case 3:
-         if ((active0 & 0x803140c011800000L) != 0L || (active1 & 0x3L) != 0L)
+         if ((active0 & 0x62818023000000L) != 0L || (active1 & 0x7L) != 0L)
             return 14;
-         if ((active0 & 0x6fce1707ee180000L) != 0L || (active1 & 0x2cL) != 0L)
+         if ((active0 & 0xdf9c2e0fdc300000L) != 0L || (active1 & 0x58L) != 0L)
          {
             if (jjmatchedPos != 3)
             {
-               jjmatchedKind = 82;
+               jjmatchedKind = 83;
                jjmatchedPos = 3;
             }
             return 14;
          }
          return -1;
       case 4:
-         if ((active0 & 0x6d0a1607e0900000L) != 0L || (active1 & 0x25L) != 0L)
+         if ((active0 & 0xda142c0fc1200000L) != 0L || (active1 & 0x4aL) != 0L)
          {
-            jjmatchedKind = 82;
+            jjmatchedKind = 83;
             jjmatchedPos = 4;
             return 14;
          }
-         if ((active0 & 0x2c401000e080000L) != 0L || (active1 & 0x8L) != 0L)
+         if ((active0 & 0x58802001c100000L) != 0L || (active1 & 0x10L) != 0L)
             return 14;
          return -1;
       case 5:
-         if ((active0 & 0x640a000600800000L) != 0L || (active1 & 0x4L) != 0L)
+         if ((active0 & 0xc814000c01000000L) != 0L || (active1 & 0x8L) != 0L)
             return 14;
-         if ((active0 & 0x9001601e0100000L) != 0L || (active1 & 0x21L) != 0L)
+         if ((active0 & 0x12002c03c0200000L) != 0L || (active1 & 0x42L) != 0L)
          {
-            jjmatchedKind = 82;
+            jjmatchedKind = 83;
             jjmatchedPos = 5;
             return 14;
          }
          return -1;
       case 6:
-         if ((active0 & 0x8001401e0000000L) != 0L || (active1 & 0x21L) != 0L)
+         if ((active0 & 0x10002803c0000000L) != 0L || (active1 & 0x42L) != 0L)
             return 14;
-         if ((active0 & 0x100020000100000L) != 0L)
+         if ((active0 & 0x200040000200000L) != 0L)
          {
             if (jjmatchedPos != 6)
             {
-               jjmatchedKind = 82;
+               jjmatchedKind = 83;
                jjmatchedPos = 6;
             }
             return 14;
          }
          return -1;
       case 7:
-         if ((active0 & 0x180000000L) != 0L)
+         if ((active0 & 0x200040000200000L) != 0L)
+            return 14;
+         if ((active0 & 0x300000000L) != 0L)
          {
-            jjmatchedKind = 82;
+            jjmatchedKind = 83;
             jjmatchedPos = 7;
             return 14;
          }
-         if ((active0 & 0x100020000100000L) != 0L)
-            return 14;
          return -1;
       case 8:
-         if ((active0 & 0x180000000L) != 0L)
+         if ((active0 & 0x300000000L) != 0L)
          {
-            jjmatchedKind = 82;
+            jjmatchedKind = 83;
             jjmatchedPos = 8;
             return 14;
          }
          return -1;
       case 9:
-         if ((active0 & 0x180000000L) != 0L)
+         if ((active0 & 0x300000000L) != 0L)
          {
-            jjmatchedKind = 82;
+            jjmatchedKind = 83;
             jjmatchedPos = 9;
             return 14;
          }
          return -1;
       case 10:
-         if ((active0 & 0x180000000L) != 0L)
+         if ((active0 & 0x300000000L) != 0L)
          {
-            jjmatchedKind = 82;
+            jjmatchedKind = 83;
             jjmatchedPos = 10;
             return 14;
          }
@@ -449,123 +449,125 @@ static private final int jjMoveStringLiteralDfa0_1()
    switch(curChar)
    {
       case 33:
-         jjmatchedKind = 117;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x5000000000L, 0x0L);
+         jjmatchedKind = 118;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0xa000000000L, 0x0L);
+      case 35:
+         return jjStopAtPos(0, 12);
       case 36:
-         return jjStartNfaWithStates_1(0, 116, 16);
+         return jjStartNfaWithStates_1(0, 117, 16);
       case 37:
-         jjmatchedKind = 131;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x2000000000000L, 0x0L);
+         jjmatchedKind = 132;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x4000000000000L, 0x0L);
       case 38:
-         jjmatchedKind = 128;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x200200000000000L, 0x0L);
+         jjmatchedKind = 129;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x400400000000000L, 0x0L);
       case 40:
-         return jjStopAtPos(0, 86);
-      case 41:
          return jjStopAtPos(0, 87);
+      case 41:
+         return jjStopAtPos(0, 88);
       case 42:
-         jjmatchedKind = 126;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x80000000000L, 0x0L);
+         jjmatchedKind = 127;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x100000000000L, 0x0L);
       case 43:
-         jjmatchedKind = 124;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x400020000000000L, 0x0L);
+         jjmatchedKind = 125;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x800040000000000L, 0x0L);
       case 44:
-         return jjStopAtPos(0, 93);
+         return jjStopAtPos(0, 94);
       case 45:
-         jjmatchedKind = 125;
-         return jjMoveStringLiteralDfa1_1(0x800000000L, 0x800040000000000L, 0x0L);
+         jjmatchedKind = 126;
+         return jjMoveStringLiteralDfa1_1(0x1000000000L, 0x1000080000000000L, 0x0L);
       case 46:
-         jjmatchedKind = 94;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x1000000000000L, 0x0L);
+         jjmatchedKind = 95;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x2000000000000L, 0x0L);
       case 47:
-         jjmatchedKind = 127;
-         return jjMoveStringLiteralDfa1_1(0x2800L, 0x100000000000L, 0x0L);
+         jjmatchedKind = 128;
+         return jjMoveStringLiteralDfa1_1(0x4800L, 0x200000000000L, 0x0L);
       case 58:
-         jjmatchedKind = 119;
-         return jjMoveStringLiteralDfa1_1(0x1000000000L, 0x0L, 0x0L);
+         jjmatchedKind = 120;
+         return jjMoveStringLiteralDfa1_1(0x2000000000L, 0x0L, 0x0L);
       case 59:
-         return jjStopAtPos(0, 92);
+         return jjStopAtPos(0, 93);
       case 60:
-         jjmatchedKind = 96;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x2400000000L, 0x90L);
+         jjmatchedKind = 97;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x4800000000L, 0x120L);
       case 61:
-         jjmatchedKind = 104;
-         return jjMoveStringLiteralDfa1_1(0x2000000000L, 0x8200000000L, 0x0L);
+         jjmatchedKind = 105;
+         return jjMoveStringLiteralDfa1_1(0x4000000000L, 0x10400000000L, 0x0L);
       case 62:
-         jjmatchedKind = 95;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x800000000L, 0x160L);
+         jjmatchedKind = 96;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x1000000000L, 0x2c0L);
       case 63:
-         jjmatchedKind = 118;
+         jjmatchedKind = 119;
          return jjMoveStringLiteralDfa1_1(0x10L, 0x0L, 0x0L);
       case 64:
-         return jjStopAtPos(0, 115);
+         return jjStopAtPos(0, 116);
       case 91:
-         return jjStopAtPos(0, 90);
-      case 93:
          return jjStopAtPos(0, 91);
+      case 93:
+         return jjStopAtPos(0, 92);
       case 94:
-         jjmatchedKind = 130;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x800000000000L, 0x0L);
+         jjmatchedKind = 131;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x1000000000000L, 0x0L);
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa1_1(0x1000000002000000L, 0x80L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x2000000004000000L, 0x100L, 0x0L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa1_1(0x8000000004000000L, 0x1L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x8000000L, 0x3L, 0x0L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa1_1(0x38000080000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x70000100000L, 0x0L, 0x0L);
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa1_1(0xc0000000000L, 0x4L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x180000000000L, 0x8L, 0x0L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa1_1(0x700100011800000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0xe00200023000000L, 0x0L, 0x0L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa1_1(0x840200000100000L, 0x8L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x1080400000200000L, 0x10L, 0x0L);
       case 71:
       case 103:
-         return jjMoveStringLiteralDfa1_1(0x400200000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x800400000000L, 0x0L, 0x0L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa1_1(0xa0400000L, 0x30L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x140800000L, 0x60L, 0x0L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa1_1(0x4000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x8000000000L, 0x0L, 0x0L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa1_1(0x1800000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x3000000000000L, 0x0L, 0x0L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa1_1(0x4000000000000000L, 0x40L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x8000000000000000L, 0x80L, 0x0L);
       case 80:
       case 112:
-         return jjMoveStringLiteralDfa1_1(0x8000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x10000000L, 0x0L, 0x0L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa1_1(0x2000140000000L, 0x2L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x4000280000000L, 0x4L, 0x0L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa1_1(0x200c000400000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x4018000800000000L, 0x0L, 0x0L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa1_1(0x30000000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x60000000000000L, 0x0L, 0x0L);
       case 86:
       case 118:
-         return jjMoveStringLiteralDfa1_1(0x200000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x400000L, 0x0L, 0x0L);
       case 87:
       case 119:
-         return jjMoveStringLiteralDfa1_1(0x80000000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x100000000000000L, 0x0L, 0x0L);
       case 123:
-         return jjStopAtPos(0, 88);
+         return jjStopAtPos(0, 89);
       case 124:
-         jjmatchedKind = 129;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x100400000000000L, 0x0L);
+         jjmatchedKind = 130;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x200800000000000L, 0x0L);
       case 125:
-         return jjStopAtPos(0, 89);
+         return jjStopAtPos(0, 90);
       case 126:
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x4000000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x8000000000000L, 0x0L);
       default :
          return jjMoveNfa_1(3, 0);
    }
@@ -580,53 +582,51 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l
    switch(curChar)
    {
       case 38:
-         if ((active1 & 0x200000000000000L) != 0L)
-            return jjStopAtPos(1, 121);
+         if ((active1 & 0x400000000000000L) != 0L)
+            return jjStopAtPos(1, 122);
          break;
       case 42:
-         if ((active0 & 0x2000L) != 0L)
-            return jjStartNfaWithStates_1(1, 13, 0);
+         if ((active0 & 0x4000L) != 0L)
+            return jjStartNfaWithStates_1(1, 14, 0);
          break;
       case 43:
-         if ((active1 & 0x400000000000000L) != 0L)
-            return jjStopAtPos(1, 122);
-         break;
-      case 45:
          if ((active1 & 0x800000000000000L) != 0L)
             return jjStopAtPos(1, 123);
          break;
+      case 45:
+         if ((active1 & 0x1000000000000000L) != 0L)
+            return jjStopAtPos(1, 124);
+         break;
       case 47:
          if ((active0 & 0x800L) != 0L)
             return jjStopAtPos(1, 11);
          break;
       case 58:
-         if ((active0 & 0x1000000000L) != 0L)
-            return jjStopAtPos(1, 36);
+         if ((active0 & 0x2000000000L) != 0L)
+            return jjStopAtPos(1, 37);
          break;
       case 60:
-         if ((active2 & 0x10L) != 0L)
+         if ((active2 & 0x20L) != 0L)
          {
-            jjmatchedKind = 132;
+            jjmatchedKind = 133;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x80L);
+         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x100L);
       case 61:
-         if ((active1 & 0x200000000L) != 0L)
+         if ((active1 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 97;
+            jjmatchedKind = 98;
             jjmatchedPos = 1;
          }
-         else if ((active1 & 0x400000000L) != 0L)
-            return jjStopAtPos(1, 98);
          else if ((active1 & 0x800000000L) != 0L)
             return jjStopAtPos(1, 99);
          else if ((active1 & 0x1000000000L) != 0L)
+            return jjStopAtPos(1, 100);
+         else if ((active1 & 0x2000000000L) != 0L)
          {
-            jjmatchedKind = 100;
+            jjmatchedKind = 101;
             jjmatchedPos = 1;
          }
-         else if ((active1 & 0x20000000000L) != 0L)
-            return jjStopAtPos(1, 105);
          else if ((active1 & 0x40000000000L) != 0L)
             return jjStopAtPos(1, 106);
          else if ((active1 & 0x80000000000L) != 0L)
@@ -645,84 +645,86 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l
             return jjStopAtPos(1, 113);
          else if ((active1 & 0x4000000000000L) != 0L)
             return jjStopAtPos(1, 114);
-         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0xc000000000L, active2, 0L);
+         else if ((active1 & 0x8000000000000L) != 0L)
+            return jjStopAtPos(1, 115);
+         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x18000000000L, active2, 0L);
       case 62:
          if ((active0 & 0x10L) != 0L)
             return jjStopAtPos(1, 4);
-         else if ((active0 & 0x800000000L) != 0L)
-            return jjStopAtPos(1, 35);
-         else if ((active0 & 0x2000000000L) != 0L)
-            return jjStopAtPos(1, 37);
-         else if ((active1 & 0x2000000000L) != 0L)
-            return jjStopAtPos(1, 101);
-         else if ((active2 & 0x20L) != 0L)
+         else if ((active0 & 0x1000000000L) != 0L)
+            return jjStopAtPos(1, 36);
+         else if ((active0 & 0x4000000000L) != 0L)
+            return jjStopAtPos(1, 38);
+         else if ((active1 & 0x4000000000L) != 0L)
+            return jjStopAtPos(1, 102);
+         else if ((active2 & 0x40L) != 0L)
          {
-            jjmatchedKind = 133;
+            jjmatchedKind = 134;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x140L);
+         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x280L);
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa2_1(active0, 0x40008000200000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x80010000400000L, active1, 0L, active2, 0L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa2_1(active0, 0x4000000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x8000000000000000L, active1, 0L, active2, 0L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa2_1(active0, 0x10000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x20000000L, active1, 0L, active2, 0L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa2_1(active0, 0x2840140000000L, active1, 0x2L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x5080280000000L, active1, 0x4L, active2, 0L);
       case 70:
       case 102:
-         if ((active0 & 0x400000L) != 0L)
-            return jjStartNfaWithStates_1(1, 22, 14);
+         if ((active0 & 0x800000L) != 0L)
+            return jjStartNfaWithStates_1(1, 23, 14);
          break;
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa2_1(active0, 0x90000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x120000000000000L, active1, 0L, active2, 0L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa2_1(active0, 0x4000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x8000000000L, active1, 0L, active2, 0L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa2_1(active0, 0x201880000L, active1, 0x8L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x403100000L, active1, 0x10L, active2, 0L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa2_1(active0, 0x7000000a0000000L, active1, 0xb0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0xe00000140000000L, active1, 0x160L, active2, 0L);
       case 79:
       case 111:
-         if ((active0 & 0x80000000000L) != 0L)
+         if ((active0 & 0x100000000000L) != 0L)
          {
-            jjmatchedKind = 43;
+            jjmatchedKind = 44;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_1(active0, 0x8800630000000000L, active1, 0x5L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x1000c60000000000L, active1, 0xbL, active2, 0L);
       case 82:
       case 114:
-         if ((active1 & 0x40L) != 0L)
-            return jjStartNfaWithStates_1(1, 70, 14);
-         return jjMoveStringLiteralDfa2_1(active0, 0x2000000e000000L, active1, 0L, active2, 0L);
+         if ((active1 & 0x80L) != 0L)
+            return jjStartNfaWithStates_1(1, 71, 14);
+         return jjMoveStringLiteralDfa2_1(active0, 0x4000001c000000L, active1, 0L, active2, 0L);
       case 83:
       case 115:
-         if ((active0 & 0x1000000000000000L) != 0L)
-            return jjStartNfaWithStates_1(1, 60, 14);
+         if ((active0 & 0x2000000000000000L) != 0L)
+            return jjStartNfaWithStates_1(1, 61, 14);
          break;
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa2_1(active0, 0x2000000400000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x4000000800000000L, active1, 0L, active2, 0L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa2_1(active0, 0x5000000100000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0xa000000200000L, active1, 0L, active2, 0L);
       case 87:
       case 119:
-         return jjMoveStringLiteralDfa2_1(active0, 0x8000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x10000000000000L, active1, 0L, active2, 0L);
       case 88:
       case 120:
-         return jjMoveStringLiteralDfa2_1(active0, 0x100000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x200000000000L, active1, 0L, active2, 0L);
       case 124:
-         if ((active1 & 0x100000000000000L) != 0L)
-            return jjStopAtPos(1, 120);
+         if ((active1 & 0x200000000000000L) != 0L)
+            return jjStopAtPos(1, 121);
          break;
       default :
          break;
@@ -741,88 +743,88 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long
    switch(curChar)
    {
       case 61:
-         if ((active1 & 0x4000000000L) != 0L)
-            return jjStopAtPos(2, 102);
-         else if ((active1 & 0x8000000000L) != 0L)
+         if ((active1 & 0x8000000000L) != 0L)
             return jjStopAtPos(2, 103);
-         else if ((active2 & 0x80L) != 0L)
-            return jjStopAtPos(2, 135);
+         else if ((active1 & 0x10000000000L) != 0L)
+            return jjStopAtPos(2, 104);
          else if ((active2 & 0x100L) != 0L)
             return jjStopAtPos(2, 136);
+         else if ((active2 & 0x200L) != 0L)
+            return jjStopAtPos(2, 137);
          break;
       case 62:
-         if ((active2 & 0x40L) != 0L)
-            return jjStopAtPos(2, 134);
+         if ((active2 & 0x80L) != 0L)
+            return jjStopAtPos(2, 135);
          break;
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa3_1(active0, 0x400080000L, active1, 0x2L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x800100000L, active1, 0x4L, active2, 0L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa3_1(active0, 0xa0000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x140000000L, active1, 0L, active2, 0L);
       case 68:
       case 100:
-         if ((active1 & 0x80L) != 0L)
-            return jjStartNfaWithStates_1(2, 71, 14);
-         return jjMoveStringLiteralDfa3_1(active0, 0x700000000000000L, active1, 0L, active2, 0L);
+         if ((active1 & 0x100L) != 0L)
+            return jjStartNfaWithStates_1(2, 72, 14);
+         return jjMoveStringLiteralDfa3_1(active0, 0xe00000000000000L, active1, 0L, active2, 0L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa3_1(active0, 0x4000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x8000000L, active1, 0L, active2, 0L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa3_1(active0, 0x40000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x80000000000L, active1, 0L, active2, 0L);
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa3_1(active0, 0x10000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x20000000L, active1, 0L, active2, 0L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa3_1(active0, 0x98000008000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x130000010000000L, active1, 0L, active2, 0L);
       case 74:
       case 106:
-         return jjMoveStringLiteralDfa3_1(active0, 0x4000000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x8000000000000000L, active1, 0L, active2, 0L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa3_1(active0, 0x41000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x82000000000000L, active1, 0L, active2, 0L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa3_1(active0, 0x30000100000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x60000200000L, active1, 0L, active2, 0L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa3_1(active0, 0x8000000200000000L, active1, 0x9L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x400000000L, active1, 0x13L, active2, 0L);
       case 80:
       case 112:
-         return jjMoveStringLiteralDfa3_1(active0, 0x4000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x8000000000000L, active1, 0L, active2, 0L);
       case 81:
       case 113:
-         return jjMoveStringLiteralDfa3_1(active0, 0x140000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x280000000L, active1, 0L, active2, 0L);
       case 82:
       case 114:
-         if ((active0 & 0x200000L) != 0L)
-            return jjStartNfaWithStates_1(2, 21, 14);
-         else if ((active0 & 0x200000000000L) != 0L)
+         if ((active0 & 0x400000L) != 0L)
+            return jjStartNfaWithStates_1(2, 22, 14);
+         else if ((active0 & 0x400000000000L) != 0L)
          {
-            jjmatchedKind = 45;
+            jjmatchedKind = 46;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_1(active0, 0x2800000002000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x5000000004000000L, active1, 0L, active2, 0L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa3_1(active0, 0xc001800000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x18003000000L, active1, 0L, active2, 0L);
       case 84:
       case 116:
-         if ((active1 & 0x10L) != 0L)
+         if ((active1 & 0x20L) != 0L)
          {
-            jjmatchedKind = 68;
+            jjmatchedKind = 69;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_1(active0, 0x2500000000000L, active1, 0x20L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x4a00000000000L, active1, 0x40L, active2, 0L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa3_1(active0, 0x20000000000000L, active1, 0x4L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x40000000000000L, active1, 0x8L, active2, 0L);
       case 87:
       case 119:
-         if ((active0 & 0x800000000000L) != 0L)
-            return jjStartNfaWithStates_1(2, 47, 14);
+         if ((active0 & 0x1000000000000L) != 0L)
+            return jjStartNfaWithStates_1(2, 48, 14);
          break;
       default :
          break;
@@ -842,69 +844,69 @@ static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long
    {
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa4_1(active0, 0x40006000000L, active1, 0x8L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x8000c000000L, active1, 0x10L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa4_1(active0, 0x200000000L, active1, 0x4L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x400000000L, active1, 0x8L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa4_1(active0, 0x100000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x200000L, active1, 0L);
       case 69:
       case 101:
-         if ((active0 & 0x1000000L) != 0L)
+         if ((active0 & 0x2000000L) != 0L)
          {
-            jjmatchedKind = 24;
+            jjmatchedKind = 25;
             jjmatchedPos = 3;
          }
-         else if ((active0 & 0x8000000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 39, 14);
-         else if ((active0 & 0x20000000000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 53, 14);
-         return jjMoveStringLiteralDfa4_1(active0, 0x4804100000800000L, active1, 0x20L);
+         else if ((active0 & 0x10000000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 40, 14);
+         else if ((active0 & 0x40000000000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 54, 14);
+         return jjMoveStringLiteralDfa4_1(active0, 0x9008200001000000L, active1, 0x40L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa4_1(active0, 0x400000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x800000000000000L, active1, 0L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa4_1(active0, 0x2200000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x4400000000000000L, active1, 0L);
       case 76:
       case 108:
-         if ((active0 & 0x1000000000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 48, 14);
-         else if ((active0 & 0x8000000000000000L) != 0L)
+         if ((active0 & 0x2000000000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 49, 14);
+         else if ((active1 & 0x1L) != 0L)
          {
-            jjmatchedKind = 63;
+            jjmatchedKind = 64;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x2L) != 0L)
-            return jjStartNfaWithStates_1(3, 65, 14);
-         return jjMoveStringLiteralDfa4_1(active0, 0x800000a0000000L, active1, 0x1L);
+         else if ((active1 & 0x4L) != 0L)
+            return jjStartNfaWithStates_1(3, 66, 14);
+         return jjMoveStringLiteralDfa4_1(active0, 0x100000140000000L, active1, 0x2L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa4_1(active0, 0x8000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x10000000L, active1, 0L);
       case 79:
       case 111:
-         if ((active0 & 0x10000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 28, 14);
-         else if ((active0 & 0x400000000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 46, 14);
+         if ((active0 & 0x20000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 29, 14);
+         else if ((active0 & 0x800000000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 47, 14);
          break;
       case 83:
       case 115:
-         if ((active0 & 0x10000000000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 52, 14);
-         return jjMoveStringLiteralDfa4_1(active0, 0x40010000080000L, active1, 0L);
+         if ((active0 & 0x20000000000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 53, 14);
+         return jjMoveStringLiteralDfa4_1(active0, 0x80020000100000L, active1, 0L);
       case 84:
       case 116:
-         if ((active0 & 0x4000000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 38, 14);
-         return jjMoveStringLiteralDfa4_1(active0, 0x8020400000000L, active1, 0L);
+         if ((active0 & 0x8000000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 39, 14);
+         return jjMoveStringLiteralDfa4_1(active0, 0x10040800000000L, active1, 0L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa4_1(active0, 0x2000140000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x4000280000000L, active1, 0L);
       case 87:
       case 119:
-         return jjMoveStringLiteralDfa4_1(active0, 0x100000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x200000000000000L, active1, 0L);
       default :
          break;
    }
@@ -923,71 +925,71 @@ static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long
    {
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa5_1(active0, 0x800000200000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x1000000400000000L, active1, 0L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa5_1(active0, 0x4008000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x8010000000000000L, active1, 0L);
       case 69:
       case 101:
-         if ((active0 & 0x40000000000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 54, 14);
-         else if ((active0 & 0x80000000000000L) != 0L)
+         if ((active0 & 0x80000000000000L) != 0L)
             return jjStartNfaWithStates_1(4, 55, 14);
-         return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x1L);
+         else if ((active0 & 0x100000000000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 56, 14);
+         return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x2L);
       case 70:
       case 102:
-         if ((active0 & 0x200000000000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 57, 14);
+         if ((active0 & 0x400000000000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 58, 14);
          break;
       case 71:
       case 103:
-         return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x20L);
+         return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x40L);
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa5_1(active0, 0x100000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x200000000000000L, active1, 0L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa5_1(active0, 0x20540800000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x40a81000000L, active1, 0L);
       case 75:
       case 107:
-         if ((active0 & 0x4000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 26, 14);
+         if ((active0 & 0x8000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 27, 14);
          break;
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x4L);
+         return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x8L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa5_1(active0, 0x2000100000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x4000200000000000L, active1, 0L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa5_1(active0, 0x400000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x800000000000000L, active1, 0L);
       case 82:
       case 114:
-         if ((active0 & 0x4000000000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 50, 14);
-         return jjMoveStringLiteralDfa5_1(active0, 0x2000000000000L, active1, 0L);
+         if ((active0 & 0x8000000000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 51, 14);
+         return jjMoveStringLiteralDfa5_1(active0, 0x4000000000000L, active1, 0L);
       case 83:
       case 115:
-         if ((active0 & 0x80000L) != 0L)
-            return jjStartNfaWithStates_1(4, 19, 14);
+         if ((active0 & 0x100000L) != 0L)
+            return jjStartNfaWithStates_1(4, 20, 14);
          break;
       case 84:
       case 116:
-         if ((active0 & 0x8000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 27, 14);
-         else if ((active0 & 0x10000000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 40, 14);
-         else if ((active1 & 0x8L) != 0L)
-            return jjStartNfaWithStates_1(4, 67, 14);
-         return jjMoveStringLiteralDfa5_1(active0, 0x100000L, active1, 0L);
+         if ((active0 & 0x10000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 28, 14);
+         else if ((active0 & 0x20000000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 41, 14);
+         else if ((active1 & 0x10L) != 0L)
+            return jjStartNfaWithStates_1(4, 68, 14);
+         return jjMoveStringLiteralDfa5_1(active0, 0x200000L, active1, 0L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa5_1(active0, 0x400a0000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x80140000000L, active1, 0L);
       case 89:
       case 121:
-         if ((active0 & 0x2000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 25, 14);
+         if ((active0 & 0x4000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 26, 14);
          break;
       default :
          break;
@@ -1007,57 +1009,57 @@ static private final int jjMoveStringLiteralDfa5_1(long old0, long active0, long
    {
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x1L);
+         return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x2L);
       case 67:
       case 99:
-         if ((active0 & 0x400000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 34, 14);
-         return jjMoveStringLiteralDfa6_1(active0, 0x800000000000000L, active1, 0L);
+         if ((active0 & 0x800000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 35, 14);
+         return jjMoveStringLiteralDfa6_1(active0, 0x1000000000000000L, active1, 0L);
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa6_1(active0, 0x1000a0000000L, active1, 0L);
+         return jjMoveStringLiteralDfa6_1(active0, 0x200140000000L, active1, 0L);
       case 69:
       case 101:
-         if ((active1 & 0x4L) != 0L)
-            return jjStartNfaWithStates_1(5, 66, 14);
-         return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x20L);
+         if ((active1 & 0x8L) != 0L)
+            return jjStartNfaWithStates_1(5, 67, 14);
+         return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x40L);
       case 70:
       case 102:
-         if ((active0 & 0x800000L) != 0L)
-            return jjStartNfaWithStates_1(5, 23, 14);
+         if ((active0 & 0x1000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 24, 14);
          break;
       case 71:
       case 103:
-         if ((active0 & 0x2000000000000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 61, 14);
+         if ((active0 & 0x4000000000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 62, 14);
          break;
       case 72:
       case 104:
-         if ((active0 & 0x8000000000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 51, 14);
+         if ((active0 & 0x10000000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 52, 14);
          break;
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa6_1(active0, 0x100000000100000L, active1, 0L);
+         return jjMoveStringLiteralDfa6_1(active0, 0x200000000200000L, active1, 0L);
       case 76:
       case 108:
-         if ((active0 & 0x200000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 33, 14);
-         return jjMoveStringLiteralDfa6_1(active0, 0x40000000000L, active1, 0L);
+         if ((active0 & 0x400000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 34, 14);
+         return jjMoveStringLiteralDfa6_1(active0, 0x80000000000L, active1, 0L);
       case 78:
       case 110:
-         if ((active0 & 0x2000000000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 49, 14);
-         return jjMoveStringLiteralDfa6_1(active0, 0x20000000000L, active1, 0L);
+         if ((active0 & 0x4000000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 50, 14);
+         return jjMoveStringLiteralDfa6_1(active0, 0x40000000000L, active1, 0L);
       case 82:
       case 114:
-         if ((active0 & 0x400000000000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 58, 14);
-         return jjMoveStringLiteralDfa6_1(active0, 0x140000000L, active1, 0L);
+         if ((active0 & 0x800000000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 59, 14);
+         return jjMoveStringLiteralDfa6_1(active0, 0x280000000L, active1, 0L);
       case 84:
       case 116:
-         if ((active0 & 0x4000000000000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 62, 14);
+         if ((active0 & 0x8000000000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 63, 14);
          break;
       default :
          break;
@@ -1077,51 +1079,51 @@ static private final int jjMoveStringLiteralDfa6_1(long old0, long active0, long
    {
       case 69:
       case 101:
-         if ((active0 & 0x20000000L) != 0L)
+         if ((active0 & 0x40000000L) != 0L)
          {
-            jjmatchedKind = 29;
+            jjmatchedKind = 30;
             jjmatchedPos = 6;
          }
-         else if ((active0 & 0x40000000L) != 0L)
+         else if ((active0 & 0x80000000L) != 0L)
          {
-            jjmatchedKind = 30;
+            jjmatchedKind = 31;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_1(active0, 0x180000000L, active1, 0L);
+         return jjMoveStringLiteralDfa7_1(active0, 0x300000000L, active1, 0L);
       case 72:
       case 104:
-         if ((active0 & 0x800000000000000L) != 0L)
-            return jjStartNfaWithStates_1(6, 59, 14);
+         if ((active0 & 0x1000000000000000L) != 0L)
+            return jjStartNfaWithStates_1(6, 60, 14);
          break;
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa7_1(active0, 0x100000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa7_1(active0, 0x200000000000000L, active1, 0L);
       case 78:
       case 110:
-         if ((active1 & 0x1L) != 0L)
-            return jjStartNfaWithStates_1(6, 64, 14);
+         if ((active1 & 0x2L) != 0L)
+            return jjStartNfaWithStates_1(6, 65, 14);
          break;
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa7_1(active0, 0x100000L, active1, 0L);
+         return jjMoveStringLiteralDfa7_1(active0, 0x200000L, active1, 0L);
       case 82:
       case 114:
-         if ((active1 & 0x20L) != 0L)
-            return jjStartNfaWithStates_1(6, 69, 14);
+         if ((active1 & 0x40L) != 0L)
+            return jjStartNfaWithStates_1(6, 70, 14);
          break;
       case 83:
       case 115:
-         if ((active0 & 0x100000000000L) != 0L)
-            return jjStartNfaWithStates_1(6, 44, 14);
+         if ((active0 & 0x200000000000L) != 0L)
+            return jjStartNfaWithStates_1(6, 45, 14);
          break;
       case 84:
       case 116:
-         if ((active0 & 0x40000000000L) != 0L)
-            return jjStartNfaWithStates_1(6, 42, 14);
+         if ((active0 & 0x80000000000L) != 0L)
+            return jjStartNfaWithStates_1(6, 43, 14);
          break;
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa7_1(active0, 0x20000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa7_1(active0, 0x40000000000L, active1, 0L);
       default :
          break;
    }
@@ -1139,18 +1141,18 @@ static private final int jjMoveStringLiteralDfa7_1(long old0, long active0, long
    switch(curChar)
    {
       case 95:
-         return jjMoveStringLiteralDfa8_1(active0, 0x180000000L);
+         return jjMoveStringLiteralDfa8_1(active0, 0x300000000L);
       case 69:
       case 101:
-         if ((active0 & 0x20000000000L) != 0L)
-            return jjStartNfaWithStates_1(7, 41, 14);
-         else if ((active0 & 0x100000000000000L) != 0L)
-            return jjStartNfaWithStates_1(7, 56, 14);
+         if ((active0 & 0x40000000000L) != 0L)
+            return jjStartNfaWithStates_1(7, 42, 14);
+         else if ((active0 & 0x200000000000000L) != 0L)
+            return jjStartNfaWithStates_1(7, 57, 14);
          break;
       case 78:
       case 110:
-         if ((active0 & 0x100000L) != 0L)
-            return jjStartNfaWithStates_1(7, 20, 14);
+         if ((active0 & 0x200000L) != 0L)
+            return jjStartNfaWithStates_1(7, 21, 14);
          break;
       default :
          break;
@@ -1170,7 +1172,7 @@ static private final int jjMoveStringLiteralDfa8_1(long old0, long active0)
    {
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa9_1(active0, 0x180000000L);
+         return jjMoveStringLiteralDfa9_1(active0, 0x300000000L);
       default :
          break;
    }
@@ -1189,7 +1191,7 @@ static private final int jjMoveStringLiteralDfa9_1(long old0, long active0)
    {
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa10_1(active0, 0x180000000L);
+         return jjMoveStringLiteralDfa10_1(active0, 0x300000000L);
       default :
          break;
    }
@@ -1208,7 +1210,7 @@ static private final int jjMoveStringLiteralDfa10_1(long old0, long active0)
    {
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa11_1(active0, 0x180000000L);
+         return jjMoveStringLiteralDfa11_1(active0, 0x300000000L);
       default :
          break;
    }
@@ -1227,10 +1229,10 @@ static private final int jjMoveStringLiteralDfa11_1(long old0, long active0)
    {
       case 69:
       case 101:
-         if ((active0 & 0x80000000L) != 0L)
-            return jjStartNfaWithStates_1(11, 31, 14);
-         else if ((active0 & 0x100000000L) != 0L)
+         if ((active0 & 0x100000000L) != 0L)
             return jjStartNfaWithStates_1(11, 32, 14);
+         else if ((active0 & 0x200000000L) != 0L)
+            return jjStartNfaWithStates_1(11, 33, 14);
          break;
       default :
          break;
@@ -1274,14 +1276,14 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjstateSet[jjnewStateCnt++] = 2;
                   if ((0x3fe000000000000L & l) != 0L)
                   {
-                     if (kind > 72)
-                        kind = 72;
+                     if (kind > 73)
+                        kind = 73;
                      jjCheckNAddTwoStates(5, 6);
                   }
                   else if (curChar == 48)
                   {
-                     if (kind > 72)
-                        kind = 72;
+                     if (kind > 73)
+                        kind = 73;
                      jjCheckNAddStates(19, 21);
                   }
                   break;
@@ -1290,8 +1292,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjstateSet[jjnewStateCnt++] = 1;
                   break;
                case 1:
-                  if ((0xffff7fffffffffffL & l) != 0L && kind > 12)
-                     kind = 12;
+                  if ((0xffff7fffffffffffL & l) != 0L && kind > 13)
+                     kind = 13;
                   break;
                case 2:
                   if (curChar == 42)
@@ -1300,15 +1302,15 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 4:
                   if ((0x3fe000000000000L & l) == 0L)
                      break;
-                  if (kind > 72)
-                     kind = 72;
+                  if (kind > 73)
+                     kind = 73;
                   jjCheckNAddTwoStates(5, 6);
                   break;
                case 5:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 72)
-                     kind = 72;
+                  if (kind > 73)
+                     kind = 73;
                   jjCheckNAddTwoStates(5, 6);
                   break;
                case 7:
@@ -1318,8 +1320,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 8:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 76)
-                     kind = 76;
+                  if (kind > 77)
+                     kind = 77;
                   jjCheckNAddStates(22, 24);
                   break;
                case 10:
@@ -1329,15 +1331,15 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 11:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 76)
-                     kind = 76;
+                  if (kind > 77)
+                     kind = 77;
                   jjCheckNAddTwoStates(11, 12);
                   break;
                case 14:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 82)
-                     kind = 82;
+                  if (kind > 83)
+                     kind = 83;
                   jjstateSet[jjnewStateCnt++] = 14;
                   break;
                case 15:
@@ -1347,8 +1349,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 17:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 137)
-                     kind = 137;
+                  if (kind > 138)
+                     kind = 138;
                   jjstateSet[jjnewStateCnt++] = 17;
                   break;
                case 18:
@@ -1362,15 +1364,15 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 20:
                   if (curChar != 46)
                      break;
-                  if (kind > 76)
-                     kind = 76;
+                  if (kind > 77)
+                     kind = 77;
                   jjCheckNAddStates(25, 27);
                   break;
                case 21:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 76)
-                     kind = 76;
+                  if (kind > 77)
+                     kind = 77;
                   jjCheckNAddStates(25, 27);
                   break;
                case 23:
@@ -1380,8 +1382,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 24:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 76)
-                     kind = 76;
+                  if (kind > 77)
+                     kind = 77;
                   jjCheckNAddTwoStates(24, 12);
                   break;
                case 25:
@@ -1395,8 +1397,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 28:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 76)
-                     kind = 76;
+                  if (kind > 77)
+                     kind = 77;
                   jjCheckNAddTwoStates(28, 12);
                   break;
                case 29:
@@ -1414,22 +1416,22 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 33:
                   if (curChar != 48)
                      break;
-                  if (kind > 72)
-                     kind = 72;
+                  if (kind > 73)
+                     kind = 73;
                   jjCheckNAddStates(19, 21);
                   break;
                case 35:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 72)
-                     kind = 72;
+                  if (kind > 73)
+                     kind = 73;
                   jjCheckNAddTwoStates(35, 6);
                   break;
                case 36:
                   if ((0xff000000000000L & l) == 0L)
                      break;
-                  if (kind > 72)
-                     kind = 72;
+                  if (kind > 73)
+                     kind = 73;
                   jjCheckNAddTwoStates(36, 6);
                   break;
                case 37:
@@ -1445,8 +1447,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjCheckNAddStates(31, 33);
                   break;
                case 41:
-                  if (curChar == 34 && kind > 78)
-                     kind = 78;
+                  if (curChar == 34 && kind > 79)
+                     kind = 79;
                   break;
                case 42:
                   if ((0xfffffffbffffffffL & l) != 0L)
@@ -1457,8 +1459,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjCheckNAddStates(34, 36);
                   break;
                case 45:
-                  if (curChar == 34 && kind > 79)
-                     kind = 79;
+                  if (curChar == 34 && kind > 80)
+                     kind = 80;
                   break;
                case 46:
                   if (curChar == 39)
@@ -1473,8 +1475,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjCheckNAddStates(37, 39);
                   break;
                case 50:
-                  if (curChar == 39 && kind > 78)
-                     kind = 78;
+                  if (curChar == 39 && kind > 79)
+                     kind = 79;
                   break;
                case 51:
                   if ((0xffffff7fffffffffL & l) != 0L)
@@ -1485,8 +1487,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjCheckNAddStates(40, 42);
                   break;
                case 54:
-                  if (curChar == 39 && kind > 80)
-                     kind = 80;
+                  if (curChar == 39 && kind > 81)
+                     kind = 81;
                   break;
                case 56:
                   jjAddStates(43, 45);
@@ -1508,43 +1510,43 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 3:
                   if ((0x87fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 82)
-                        kind = 82;
+                     if (kind > 83)
+                        kind = 83;
                      jjCheckNAdd(14);
                   }
                   else if (curChar == 96)
                      jjCheckNAddStates(49, 54);
                   break;
                case 1:
-                  if (kind > 12)
-                     kind = 12;
+                  if (kind > 13)
+                     kind = 13;
                   break;
                case 6:
-                  if ((0x100000001000L & l) != 0L && kind > 72)
-                     kind = 72;
+                  if ((0x100000001000L & l) != 0L && kind > 73)
+                     kind = 73;
                   break;
                case 9:
                   if ((0x2000000020L & l) != 0L)
                      jjAddStates(55, 56);
                   break;
                case 12:
-                  if ((0x5000000050L & l) != 0L && kind > 76)
-                     kind = 76;
+                  if ((0x5000000050L & l) != 0L && kind > 77)
+                     kind = 77;
                   break;
                case 13:
                case 14:
                   if ((0x87fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 82)
-                     kind = 82;
+                  if (kind > 83)
+                     kind = 83;
                   jjCheckNAdd(14);
                   break;
                case 16:
                case 17:
                   if ((0x87fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 137)
-                     kind = 137;
+                  if (kind > 138)
+                     kind = 138;
                   jjCheckNAdd(17);
                   break;
                case 22:
@@ -1566,8 +1568,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 35:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 72)
-                     kind = 72;
+                  if (kind > 73)
+                     kind = 73;
                   jjCheckNAddTwoStates(35, 6);
                   break;
                case 38:
@@ -1615,8 +1617,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjstateSet[jjnewStateCnt++] = 57;
                   break;
                case 59:
-                  if (curChar == 96 && kind > 78)
-                     kind = 78;
+                  if (curChar == 96 && kind > 79)
+                     kind = 79;
                   break;
                case 60:
                   if ((0xfffffffeffffffffL & l) != 0L)
@@ -1631,8 +1633,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjstateSet[jjnewStateCnt++] = 61;
                   break;
                case 63:
-                  if (curChar == 96 && kind > 81)
-                     kind = 81;
+                  if (curChar == 96 && kind > 82)
+                     kind = 82;
                   break;
                default : break;
             }
@@ -1650,20 +1652,20 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 14:
                   if ((jjbitVec0[i2] & l2) == 0L)
                      break;
-                  if (kind > 82)
-                     kind = 82;
+                  if (kind > 83)
+                     kind = 83;
                   jjCheckNAdd(14);
                   break;
                case 1:
-                  if ((jjbitVec0[i2] & l2) != 0L && kind > 12)
-                     kind = 12;
+                  if ((jjbitVec0[i2] & l2) != 0L && kind > 13)
+                     kind = 13;
                   break;
                case 16:
                case 17:
                   if ((jjbitVec0[i2] & l2) == 0L)
                      break;
-                  if (kind > 137)
-                     kind = 137;
+                  if (kind > 138)
+                     kind = 138;
                   jjCheckNAdd(17);
                   break;
                case 38:
@@ -1712,7 +1714,7 @@ static private final int jjMoveStringLiteralDfa0_3()
    switch(curChar)
    {
       case 42:
-         return jjMoveStringLiteralDfa1_3(0x10000L);
+         return jjMoveStringLiteralDfa1_3(0x20000L);
       default :
          return 1;
    }
@@ -1726,8 +1728,8 @@ static private final int jjMoveStringLiteralDfa1_3(long active0)
    switch(curChar)
    {
       case 47:
-         if ((active0 & 0x10000L) != 0L)
-            return jjStopAtPos(1, 16);
+         if ((active0 & 0x20000L) != 0L)
+            return jjStopAtPos(1, 17);
          break;
       default :
          return 2;
@@ -1743,16 +1745,16 @@ static final int[] jjnextStates = {
 public static final String[] jjstrLiteralImages = {
 "", "\74\77", null, "\74\77\75", "\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, 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, "\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, "\50", "\51", "\173", "\175", "\133", 
-"\135", "\73", "\54", "\56", "\76", "\74", "\75\75", "\74\75", "\76\75", "\41\75", 
-"\74\76", "\41\75\75", "\75\75\75", "\75", "\53\75", "\55\75", "\52\75", "\57\75", 
-"\46\75", "\174\75", "\136\75", "\56\75", "\45\75", "\176\75", "\100", "\44", "\41", 
-"\77", "\72", "\174\174", "\46\46", "\53\53", "\55\55", "\53", "\55", "\52", "\57", 
-"\46", "\174", "\136", "\45", "\74\74", "\76\76", "\76\76\76", "\74\74\75", 
+null, null, null, null, null, null, null, null, null, "\50", "\51", "\173", "\175", 
+"\133", "\135", "\73", "\54", "\56", "\76", "\74", "\75\75", "\74\75", "\76\75", 
+"\41\75", "\74\76", "\41\75\75", "\75\75\75", "\75", "\53\75", "\55\75", "\52\75", 
+"\57\75", "\46\75", "\174\75", "\136\75", "\56\75", "\45\75", "\176\75", "\100", "\44", 
+"\41", "\77", "\72", "\174\174", "\46\46", "\53\53", "\55\55", "\53", "\55", "\52", 
+"\57", "\46", "\174", "\136", "\45", "\74\74", "\76\76", "\76\76\76", "\74\74\75", 
 "\76\76\75", null, "\77\76", };
 public static final String[] lexStateNames = {
    "DEFAULT", 
@@ -1762,24 +1764,24 @@ public static final String[] lexStateNames = {
    "IN_MULTI_LINE_COMMENT", 
 };
 public static final int[] jjnewLexState = {
-   -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, 0, -1, -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, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
 };
 static final long[] jjtoToken = {
-   0xfffffffffff8001fL, 0xffffffffffc7d1ffL, 0x7ffL, 
+   0xfffffffffff0001fL, 0xffffffffff8fa3ffL, 0xfffL, 
 };
 static final long[] jjtoSkip = {
-   0x3ffe0L, 0x0L, 0x0L, 
+   0x7ffe0L, 0x0L, 0x0L, 
 };
 static final long[] jjtoSpecial = {
-   0x3f800L, 0x0L, 0x0L, 
+   0x7f800L, 0x0L, 0x0L, 
 };
 static final long[] jjtoMore = {
-   0x40000L, 0x0L, 0x0L, 
+   0x80000L, 0x0L, 0x0L, 
 };
 static protected SimpleCharStream input_stream;
 static private final int[] jjrounds = new int[64];
@@ -1897,27 +1899,27 @@ public static Token getNextToken()
          jjmatchedKind = 0x7fffffff;
          jjmatchedPos = 0;
          curPos = jjMoveStringLiteralDfa0_2();
-         if (jjmatchedPos == 0 && jjmatchedKind > 18)
+         if (jjmatchedPos == 0 && jjmatchedKind > 19)
          {
-            jjmatchedKind = 18;
+            jjmatchedKind = 19;
          }
          break;
        case 3:
          jjmatchedKind = 0x7fffffff;
          jjmatchedPos = 0;
          curPos = jjMoveStringLiteralDfa0_3();
-         if (jjmatchedPos == 0 && jjmatchedKind > 18)
+         if (jjmatchedPos == 0 && jjmatchedKind > 19)
          {
-            jjmatchedKind = 18;
+            jjmatchedKind = 19;
          }
          break;
        case 4:
          jjmatchedKind = 0x7fffffff;
          jjmatchedPos = 0;
          curPos = jjMoveStringLiteralDfa0_4();
-         if (jjmatchedPos == 0 && jjmatchedKind > 18)
+         if (jjmatchedPos == 0 && jjmatchedKind > 19)
          {
-            jjmatchedKind = 18;
+            jjmatchedKind = 19;
          }
          break;
      }
@@ -1992,7 +1994,7 @@ static void SkipLexicalActions(Token matchedToken)
 {
    switch(jjmatchedKind)
    {
-      case 12 :
+      case 13 :
          if (image == null)
             image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
          else