]> source.dussan.org Git - vaadin-framework.git/commitdiff
Adds support for CSS3 selectors #9858 (autor: seba)
authorMarc Englund <marc@vaadin.com>
Thu, 4 Oct 2012 11:55:56 +0000 (14:55 +0300)
committerMarc Englund <marc@vaadin.com>
Thu, 4 Oct 2012 11:55:56 +0000 (14:55 +0300)
Change-Id: Icd8e0fd09c3964ebbfab8f130d7945e51af326d7

theme-compiler/src/com/vaadin/sass/parser/Parser.java
theme-compiler/src/com/vaadin/sass/parser/Parser.jj
theme-compiler/src/com/vaadin/sass/parser/ParserConstants.java
theme-compiler/src/com/vaadin/sass/parser/ParserTokenManager.java
theme-compiler/tests/resources/basic/selectors.css

index e3b3be4b51285bfbfa55d651510fff5f454fce6d..a841bd5445372697e9fd32ec8c3ae90e1200e5a6 100644 (file)
@@ -2125,6 +2125,9 @@ String s = ".";
     }
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case DASHMATCH:
+    case CARETMATCH:
+    case DOLLARMATCH:
+    case STARMATCH:
     case INCLUDES:
     case EQ:
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -2140,6 +2143,18 @@ String s = ".";
         jj_consume_token(DASHMATCH);
                           cases = 3;
         break;
+      case CARETMATCH:
+        jj_consume_token(CARETMATCH);
+                           cases = 4;
+        break;
+      case DOLLARMATCH:
+        jj_consume_token(DOLLARMATCH);
+                            cases = 5;
+        break;
+      case STARMATCH:
+        jj_consume_token(STARMATCH);
+                          cases = 6;
+        break;
       default:
         jj_la1[86] = jj_gen;
         jj_consume_token(-1);
@@ -2204,6 +2219,15 @@ String s = ".";
           case 3:
           c = name + "|=" +attValue;
           break;
+          case 4:
+          c = name + "^=" +attValue;
+          break;
+          case 5:
+          c = name + "$=" +attValue;
+          break;
+          case 6:
+          c = name + "*=" +attValue;
+          break;
           default:
           // never reached.
           c = null;
@@ -5196,40 +5220,6 @@ LexicalUnit exp;
     finally { jj_save(10, xla); }
   }
 
-  private boolean jj_3R_142() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_151()) {
-    jj_scanpos = xsp;
-    if (jj_3R_152()) {
-    jj_scanpos = xsp;
-    if (jj_3R_153()) {
-    jj_scanpos = xsp;
-    if (jj_3R_154()) {
-    jj_scanpos = xsp;
-    if (jj_3R_155()) return true;
-    }
-    }
-    }
-    }
-    return false;
-  }
-
-  private boolean jj_3R_169() {
-    if (jj_3R_145()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_165() {
-    if (jj_scan_token(HASH)) return true;
-    return false;
-  }
-
-  private boolean jj_3_1() {
-    if (jj_3R_138()) return true;
-    return false;
-  }
-
   private boolean jj_3R_174() {
     if (jj_scan_token(COMMA)) return true;
     Token xsp;
@@ -5265,14 +5255,13 @@ LexicalUnit exp;
     return false;
   }
 
-  private boolean jj_3R_224() {
-    if (jj_3R_169()) return true;
+  private boolean jj_3_1() {
+    if (jj_3R_138()) return true;
     return false;
   }
 
-  private boolean jj_3_4() {
-    if (jj_3R_141()) return true;
-    if (jj_3R_142()) return true;
+  private boolean jj_3R_224() {
+    if (jj_3R_169()) return true;
     return false;
   }
 
@@ -5289,6 +5278,12 @@ LexicalUnit exp;
     return false;
   }
 
+  private boolean jj_3_4() {
+    if (jj_3R_141()) return true;
+    if (jj_3R_142()) return true;
+    return false;
+  }
+
   private boolean jj_3_7() {
     if (jj_3R_138()) return true;
     return false;
@@ -5324,23 +5319,18 @@ LexicalUnit exp;
     return false;
   }
 
-  private boolean jj_3_2() {
-    if (jj_3R_138()) return true;
-    return false;
-  }
-
   private boolean jj_3_5() {
     if (jj_3R_143()) return true;
     return false;
   }
 
-  private boolean jj_3R_210() {
-    if (jj_scan_token(IDENT)) return true;
+  private boolean jj_3_2() {
+    if (jj_3R_138()) return true;
     return false;
   }
 
-  private boolean jj_3R_221() {
-    if (jj_scan_token(INTERPOLATION)) return true;
+  private boolean jj_3R_210() {
+    if (jj_scan_token(IDENT)) return true;
     return false;
   }
 
@@ -5373,11 +5363,36 @@ LexicalUnit exp;
     return false;
   }
 
+  private boolean jj_3R_221() {
+    if (jj_scan_token(INTERPOLATION)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_207() {
+    if (jj_scan_token(DIMEN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_206() {
+    if (jj_scan_token(KHZ)) return true;
+    return false;
+  }
+
   private boolean jj_3R_168() {
     if (jj_scan_token(LBRACKET)) return true;
     return false;
   }
 
+  private boolean jj_3R_205() {
+    if (jj_scan_token(HZ)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_204() {
+    if (jj_scan_token(MS)) return true;
+    return false;
+  }
+
   private boolean jj_3R_156() {
     if (jj_scan_token(IDENT)) return true;
     Token xsp;
@@ -5393,8 +5408,8 @@ LexicalUnit exp;
     return false;
   }
 
-  private boolean jj_3R_207() {
-    if (jj_scan_token(DIMEN)) return true;
+  private boolean jj_3R_203() {
+    if (jj_scan_token(SECOND)) return true;
     return false;
   }
 
@@ -5408,13 +5423,23 @@ LexicalUnit exp;
     return false;
   }
 
+  private boolean jj_3R_144() {
+    if (jj_scan_token(COMMA)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
   private boolean jj_3R_188() {
     if (jj_scan_token(PARENT)) return true;
     return false;
   }
 
-  private boolean jj_3R_206() {
-    if (jj_scan_token(KHZ)) return true;
+  private boolean jj_3R_202() {
+    if (jj_scan_token(GRAD)) return true;
     return false;
   }
 
@@ -5423,13 +5448,18 @@ LexicalUnit exp;
     return false;
   }
 
-  private boolean jj_3R_205() {
-    if (jj_scan_token(HZ)) return true;
+  private boolean jj_3R_201() {
+    if (jj_scan_token(RAD)) return true;
     return false;
   }
 
-  private boolean jj_3R_204() {
-    if (jj_scan_token(MS)) return true;
+  private boolean jj_3R_158() {
+    if (jj_scan_token(LBRACE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_200() {
+    if (jj_scan_token(DEG)) return true;
     return false;
   }
 
@@ -5448,8 +5478,8 @@ LexicalUnit exp;
     return false;
   }
 
-  private boolean jj_3R_203() {
-    if (jj_scan_token(SECOND)) return true;
+  private boolean jj_3R_199() {
+    if (jj_scan_token(EXS)) return true;
     return false;
   }
 
@@ -5476,18 +5506,16 @@ LexicalUnit exp;
     return false;
   }
 
-  private boolean jj_3R_144() {
-    if (jj_scan_token(COMMA)) return true;
+  private boolean jj_3_10() {
     Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
-    }
+    xsp = jj_scanpos;
+    if (jj_3R_144()) jj_scanpos = xsp;
+    if (jj_3R_145()) return true;
     return false;
   }
 
-  private boolean jj_3R_202() {
-    if (jj_scan_token(GRAD)) return true;
+  private boolean jj_3R_198() {
+    if (jj_scan_token(EMS)) return true;
     return false;
   }
 
@@ -5506,23 +5534,18 @@ LexicalUnit exp;
     return false;
   }
 
-  private boolean jj_3R_201() {
-    if (jj_scan_token(RAD)) return true;
-    return false;
-  }
-
   private boolean jj_3R_180() {
     if (jj_scan_token(RPARAN)) return true;
     return false;
   }
 
-  private boolean jj_3R_179() {
-    if (jj_scan_token(FUNCTION)) return true;
+  private boolean jj_3R_197() {
+    if (jj_scan_token(PX)) return true;
     return false;
   }
 
-  private boolean jj_3R_158() {
-    if (jj_scan_token(LBRACE)) return true;
+  private boolean jj_3R_179() {
+    if (jj_scan_token(FUNCTION)) return true;
     return false;
   }
 
@@ -5536,13 +5559,13 @@ LexicalUnit exp;
     return false;
   }
 
-  private boolean jj_3R_200() {
-    if (jj_scan_token(DEG)) return true;
+  private boolean jj_3R_177() {
+    if (jj_scan_token(INTERPOLATION)) return true;
     return false;
   }
 
-  private boolean jj_3R_177() {
-    if (jj_scan_token(INTERPOLATION)) return true;
+  private boolean jj_3R_196() {
+    if (jj_scan_token(IN)) return true;
     return false;
   }
 
@@ -5551,8 +5574,13 @@ LexicalUnit exp;
     return false;
   }
 
-  private boolean jj_3R_199() {
-    if (jj_scan_token(EXS)) return true;
+  private boolean jj_3R_157() {
+    if (jj_3R_169()) return true;
+    return false;
+  }
+
+  private boolean jj_3_9() {
+    if (jj_3R_143()) return true;
     return false;
   }
 
@@ -5592,21 +5620,18 @@ LexicalUnit exp;
     return false;
   }
 
-  private boolean jj_3_10() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_144()) jj_scanpos = xsp;
-    if (jj_3R_145()) return true;
+  private boolean jj_3R_195() {
+    if (jj_scan_token(PC)) return true;
     return false;
   }
 
-  private boolean jj_3R_198() {
-    if (jj_scan_token(EMS)) return true;
+  private boolean jj_3R_194() {
+    if (jj_scan_token(MM)) return true;
     return false;
   }
 
-  private boolean jj_3R_197() {
-    if (jj_scan_token(PX)) return true;
+  private boolean jj_3R_193() {
+    if (jj_scan_token(CM)) return true;
     return false;
   }
 
@@ -5615,104 +5640,34 @@ LexicalUnit exp;
     return false;
   }
 
-  private boolean jj_3R_147() {
-    if (jj_scan_token(MICROSOFT_RULE)) return true;
+  private boolean jj_3R_143() {
+    if (jj_3R_156()) return true;
+    if (jj_scan_token(COLON)) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
     }
-    if (jj_scan_token(COLON)) return true;
-    if (jj_3R_162()) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_162()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
-  private boolean jj_3R_196() {
-    if (jj_scan_token(IN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_185() {
-    if (jj_scan_token(PRECEDES)) return true;
-    return false;
-  }
-
-  private boolean jj_3_3() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_139()) {
-    jj_scanpos = xsp;
-    if (jj_3R_140()) return true;
-    }
-    return false;
-  }
-
-  private boolean jj_3R_157() {
-    if (jj_3R_169()) return true;
-    return false;
-  }
-
-  private boolean jj_3_9() {
-    if (jj_3R_143()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_195() {
-    if (jj_scan_token(PC)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_184() {
-    if (jj_scan_token(PLUS)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_163() {
-    Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_184()) {
+    if (jj_3R_157()) {
     jj_scanpos = xsp;
-    if (jj_3R_185()) return true;
+    if (jj_3R_158()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_194() {
-    if (jj_scan_token(MM)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_193() {
-    if (jj_scan_token(CM)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_149() {
-    if (jj_scan_token(PRECEDES)) return true;
+  private boolean jj_3R_147() {
+    if (jj_scan_token(MICROSOFT_RULE)) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
     }
-    return false;
-  }
-
-  private boolean jj_3R_143() {
-    if (jj_3R_156()) return true;
     if (jj_scan_token(COLON)) return true;
-    Token xsp;
+    if (jj_3R_162()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
-    }
-    xsp = jj_scanpos;
-    if (jj_3R_157()) {
-    jj_scanpos = xsp;
-    if (jj_3R_158()) return true;
+      if (jj_3R_162()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
@@ -5722,33 +5677,17 @@ LexicalUnit exp;
     return false;
   }
 
-  private boolean jj_3R_150() {
-    if (jj_scan_token(S)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_163()) jj_scanpos = xsp;
-    return false;
-  }
-
-  private boolean jj_3R_148() {
-    if (jj_scan_token(PLUS)) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
-    }
+  private boolean jj_3R_185() {
+    if (jj_scan_token(PRECEDES)) return true;
     return false;
   }
 
-  private boolean jj_3R_141() {
+  private boolean jj_3_3() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_148()) {
-    jj_scanpos = xsp;
-    if (jj_3R_149()) {
+    if (jj_3R_139()) {
     jj_scanpos = xsp;
-    if (jj_3R_150()) return true;
-    }
+    if (jj_3R_140()) return true;
     }
     return false;
   }
@@ -5779,11 +5718,26 @@ LexicalUnit exp;
     return false;
   }
 
+  private boolean jj_3R_184() {
+    if (jj_scan_token(PLUS)) return true;
+    return false;
+  }
+
   private boolean jj_3R_189() {
     if (jj_3R_215()) return true;
     return false;
   }
 
+  private boolean jj_3R_163() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_184()) {
+    jj_scanpos = xsp;
+    if (jj_3R_185()) return true;
+    }
+    return false;
+  }
+
   private boolean jj_3R_190() {
     if (jj_scan_token(NUMBER)) return true;
     return false;
@@ -5852,6 +5806,16 @@ LexicalUnit exp;
     return false;
   }
 
+  private boolean jj_3R_149() {
+    if (jj_scan_token(PRECEDES)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
   private boolean jj_3_8() {
     if (jj_3R_143()) return true;
     return false;
@@ -5881,23 +5845,44 @@ LexicalUnit exp;
     return false;
   }
 
-  private boolean jj_3R_146() {
-    if (jj_3R_161()) return true;
+  private boolean jj_3R_150() {
+    if (jj_scan_token(S)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_163()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_217() {
-    if (jj_scan_token(HASH)) return true;
+  private boolean jj_3R_148() {
+    if (jj_scan_token(PLUS)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  private boolean jj_3R_155() {
-    if (jj_3R_168()) return true;
+  private boolean jj_3R_141() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_148()) {
+    jj_scanpos = xsp;
+    if (jj_3R_149()) {
+    jj_scanpos = xsp;
+    if (jj_3R_150()) return true;
+    }
+    }
     return false;
   }
 
-  private boolean jj_3R_154() {
-    if (jj_3R_167()) return true;
+  private boolean jj_3R_146() {
+    if (jj_3R_161()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_217() {
+    if (jj_scan_token(HASH)) return true;
     return false;
   }
 
@@ -5921,6 +5906,34 @@ LexicalUnit exp;
     return false;
   }
 
+  private boolean jj_3_11() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_146()) jj_scanpos = xsp;
+    if (jj_3R_145()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_218() {
+    if (jj_scan_token(URL)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_155() {
+    if (jj_3R_168()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_169() {
+    if (jj_3R_145()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_154() {
+    if (jj_3R_167()) return true;
+    return false;
+  }
+
   private boolean jj_3R_153() {
     if (jj_3R_166()) return true;
     return false;
@@ -5931,21 +5944,32 @@ LexicalUnit exp;
     return false;
   }
 
-  private boolean jj_3_11() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_146()) jj_scanpos = xsp;
-    if (jj_3R_145()) return true;
+  private boolean jj_3R_151() {
+    if (jj_3R_164()) return true;
     return false;
   }
 
-  private boolean jj_3R_151() {
-    if (jj_3R_164()) return true;
+  private boolean jj_3R_142() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_151()) {
+    jj_scanpos = xsp;
+    if (jj_3R_152()) {
+    jj_scanpos = xsp;
+    if (jj_3R_153()) {
+    jj_scanpos = xsp;
+    if (jj_3R_154()) {
+    jj_scanpos = xsp;
+    if (jj_3R_155()) return true;
+    }
+    }
+    }
+    }
     return false;
   }
 
-  private boolean jj_3R_218() {
-    if (jj_scan_token(URL)) return true;
+  private boolean jj_3R_165() {
+    if (jj_scan_token(HASH)) return true;
     return false;
   }
 
@@ -5971,16 +5995,16 @@ LexicalUnit exp;
       jj_la1_init_3();
    }
    private static void jj_la1_init_0() {
-      jj_la1_0 = new int[] {0x0,0xc02,0xc02,0x0,0xc00,0x2,0x2,0x2,0x0,0x1d000000,0xc00,0x2,0xc00,0x2,0x0,0x2,0x0,0x2,0x2,0x2,0x1d3ed400,0x1d3ed400,0x2,0x80000,0x2,0x2,0x2,0x2,0x0,0x0,0x2,0x0,0x100000,0x2,0x0,0x2,0x2,0x2,0x2,0x0,0x100000,0x2,0x0,0x2,0x3ed400,0x2,0x2,0x220000,0x2,0x220000,0x220002,0x2,0x50010002,0x50010002,0x2,0x2,0x2,0x2,0x2,0x1d000000,0x0,0x0,0x0,0x1d000000,0x2,0x80000,0x2,0x2,0x11000000,0x11000000,0x11000000,0x11000000,0x11000000,0x11000000,0x11000000,0x11000000,0x11000000,0x11000000,0x1d000000,0x0,0x0,0x0,0x0,0xc000000,0x2,0x2,0x1c000,0x2,0x0,0x2,0x1c000,0x0,0x2,0x2,0x0,0x2,0x0,0x2,0x100000,0xe4e70002,0x2,0x1d000000,0x0,0x1d000000,0x2,0x0,0x2,0xe4e70002,0x0,0x2,0x1d000000,0x0,0x1d000000,0x2,0xe4e70002,0x2,0x2,0x2,0x0,0x2,0x1d000000,0x0,0x0,0x1d000000,0x2,0x2,0x80000,0x2,0x2,0x2,0x2,0x0,0x2,0x1d000000,0x0,0x1d000000,0x2,0x80000,0x2,0x2,0x2,0x80000,0x0,0x60000,0x80000,0x2,0x60000,0x2,0x0,0x2,0x100000,0x2,0x2,0x2,0x40000000,0x2,0x2,0x2,0x80000,0x2,0x2,0x0,0x2,0x2,0x2,0x100000,0x2,0x2,0x0,0x100000,0x2,0x0,0x2,0x2,0x0,0x2,0x0,0x100000,0x2,0x0,0x2,0x61000,0x2,0x0,0x2,0x2,0x2,0x2,0x880000,0x880000,0x60000,0x60000,0x0,0x0,0x60000,0x2,0x60000,0x2,0x60000,0x2,0x1d000000,0x2,0x2,0x2,0x0,0x100000,0x2,0x0,0x2,};
+      jj_la1_0 = new int[] {0x0,0xc02,0xc02,0x0,0xc00,0x2,0x2,0x2,0x0,0xe8000000,0xc00,0x2,0xc00,0x2,0x0,0x2,0x0,0x2,0x2,0x2,0xe9f45400,0xe9f45400,0x2,0x400000,0x2,0x2,0x2,0x2,0x0,0x0,0x2,0x0,0x800000,0x2,0x0,0x2,0x2,0x2,0x2,0x0,0x800000,0x2,0x0,0x2,0x1f45400,0x2,0x2,0x1100000,0x2,0x1100000,0x1100002,0x2,0x80080002,0x80080002,0x2,0x2,0x2,0x2,0x2,0xe8000000,0x0,0x0,0x0,0xe8000000,0x2,0x400000,0x2,0x2,0x88000000,0x88000000,0x88000000,0x88000000,0x88000000,0x88000000,0x88000000,0x88000000,0x88000000,0x88000000,0xe8000000,0x0,0x0,0x0,0x0,0x60000000,0x2,0x2,0xfc000,0x2,0x0,0x2,0xfc000,0x0,0x2,0x2,0x0,0x2,0x0,0x2,0x800000,0x27380002,0x2,0xe8000000,0x0,0xe8000000,0x2,0x0,0x2,0x27380002,0x0,0x2,0xe8000000,0x0,0xe8000000,0x2,0x27380002,0x2,0x2,0x2,0x0,0x2,0xe8000000,0x0,0x0,0xe8000000,0x2,0x2,0x400000,0x2,0x2,0x2,0x2,0x0,0x2,0xe8000000,0x0,0xe8000000,0x2,0x400000,0x2,0x2,0x2,0x400000,0x0,0x300000,0x400000,0x2,0x300000,0x2,0x0,0x2,0x800000,0x2,0x2,0x2,0x0,0x2,0x2,0x2,0x400000,0x2,0x2,0x0,0x2,0x2,0x2,0x800000,0x2,0x2,0x0,0x800000,0x2,0x0,0x2,0x2,0x0,0x2,0x0,0x800000,0x2,0x0,0x2,0x301000,0x2,0x0,0x2,0x2,0x2,0x2,0x4400000,0x4400000,0x300000,0x300000,0x0,0x0,0x300000,0x2,0x300000,0x2,0x300000,0x2,0xe8000000,0x2,0x2,0x2,0x0,0x800000,0x2,0x0,0x2,};
    }
    private static void jj_la1_init_1() {
-      jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1060018,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x38,0x38,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18,0x18,0x0,0x0,0x0,0x0,0x0,0x95040018,0x80000000,0x4000000,0x11040000,0x18,0x0,0x0,0x0,0x0,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x18,0x10,0x10,0x10,0x10,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7,0x0,0x10040018,0x10040000,0x18,0x0,0x8000000,0x0,0x7,0x0,0x0,0x10040018,0x10040000,0x18,0x0,0x7,0x0,0x0,0x0,0x0,0x0,0x10040018,0x40000,0x10000000,0x18,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x11040018,0x11040000,0x18,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+      jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x83000c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc2,0xc2,0x0,0x0,0x0,0x0,0x0,0xa82000c0,0x0,0x20000000,0x88200000,0xc0,0x0,0x0,0x0,0x0,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0xc0,0x80,0x80,0x80,0x80,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3f,0x0,0x802000c0,0x80200000,0xc0,0x0,0x40000000,0x0,0x3f,0x0,0x0,0x802000c0,0x80200000,0xc0,0x0,0x3f,0x0,0x0,0x0,0x0,0x0,0x802000c0,0x200000,0x80000000,0xc0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x882000c0,0x88200000,0xc0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x60000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
    }
    private static void jj_la1_init_2() {
-      jj_la1_2 = new int[] {0x10000000,0x80000000,0x80000000,0x4000000,0x80000000,0x0,0x0,0x0,0x80,0x6a000088,0x80000000,0x0,0x80000000,0x0,0x44,0x0,0x8,0x0,0x0,0x0,0xfe00015c,0xfe00015c,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x8,0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x8,0x0,0xfc000154,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18,0x18,0x0,0x0,0x0,0x0,0x0,0xa000088,0x8,0x0,0x8000080,0x2000008,0x0,0x0,0x0,0x0,0x2000000,0x2000000,0x0,0x0,0x2000000,0x2000000,0x2000000,0x2000000,0x2000000,0x2000000,0x2000008,0x8,0x8,0x8,0x8,0x8,0x0,0x0,0x0,0x0,0xc,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x2,0x0,0x0,0x98,0x0,0xa000088,0x8000080,0x2000008,0x0,0x0,0x0,0x98,0x1,0x0,0xa000088,0x8000080,0x2000008,0x0,0x98,0x0,0x0,0x0,0x88,0x0,0xa000088,0x0,0x8000080,0x2000008,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0xa000088,0x8000080,0x2000008,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3ffffdc,0x0,0x0,0x3ffffdc,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x8,0x0,0x3ffffdc,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1ffff10,0x200004c,0x3ffff5c,0x0,0x3ffffdc,0x0,0x3ffffdc,0x0,0x6e000008,0x0,0x0,0x0,0x8,0x0,0x0,0x8,0x0,};
+      jj_la1_2 = new int[] {0x80000000,0x0,0x0,0x20000000,0x0,0x0,0x0,0x0,0x400,0x50000440,0x0,0x0,0x0,0x0,0x220,0x0,0x40,0x0,0x0,0x0,0xf0000ae0,0xf0000ae0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x40,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x40,0x0,0xe0000aa0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc0,0xc0,0x0,0x0,0x0,0x0,0x0,0x50000444,0x44,0x0,0x40000400,0x10000040,0x0,0x0,0x0,0x0,0x10000000,0x10000000,0x0,0x0,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000040,0x40,0x40,0x40,0x40,0x40,0x0,0x0,0x0,0x0,0x60,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x10,0x0,0x0,0x4c0,0x0,0x50000440,0x40000400,0x10000040,0x0,0x0,0x0,0x4c0,0x8,0x0,0x50000440,0x40000400,0x10000040,0x0,0x4c0,0x0,0x0,0x0,0x440,0x0,0x50000440,0x0,0x40000400,0x10000040,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x50000440,0x40000400,0x10000040,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1ffffee0,0x0,0x0,0x1ffffee0,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x40,0x0,0x1ffffee0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffff880,0x10000260,0x1ffffae0,0x0,0x1ffffee0,0x0,0x1ffffee0,0x0,0x70000040,0x0,0x0,0x0,0x40,0x0,0x0,0x40,0x0,};
    }
    private static void jj_la1_init_3() {
-      jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3401,0x3401,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3401,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x1000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1400,0x0,0x0,0x1400,0x0,0x1000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x1400,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x400,0x1400,0x0,0x1400,0x0,0x1400,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+      jj_la1_3 = new int[] {0x0,0x4,0x4,0x0,0x4,0x0,0x0,0x0,0x0,0x3,0x4,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1a00f,0x1a00f,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1a00f,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa000,0x0,0x0,0xa000,0x0,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0xa000,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000,0x2000,0xa000,0x0,0xa000,0x0,0xa000,0x0,0x3,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
    }
   final private JJCalls[] jj_2_rtns = new JJCalls[11];
   private boolean jj_rescan = false;
@@ -6134,7 +6158,7 @@ LexicalUnit exp;
   /** Generate ParseException. */
   public ParseException generateParseException() {
     jj_expentries.clear();
-    boolean[] la1tokens = new boolean[110];
+    boolean[] la1tokens = new boolean[113];
     if (jj_kind >= 0) {
       la1tokens[jj_kind] = true;
       jj_kind = -1;
@@ -6157,7 +6181,7 @@ LexicalUnit exp;
         }
       }
     }
-    for (int i = 0; i < 110; i++) {
+    for (int i = 0; i < 113; i++) {
       if (la1tokens[i]) {
         jj_expentry = new int[1];
         jj_expentry[0] = i;
index ed27af75123e686c643051913e2a061702147159..9148da9ff99cde92108dc51cc3344a8de8fe0f0e 100644 (file)
@@ -491,6 +491,9 @@ TOKEN :
   | < LBRACE : "{" >
   | < RBRACE : "}">
   | < DASHMATCH : "|=" >
+  | < CARETMATCH : "^=" >
+  | < DOLLARMATCH : "$=" >
+  | < STARMATCH : "*=" >
   | < INCLUDES  : "~=" >
   | < EQ        : "=" >
   | < PLUS      : "+" >
@@ -1229,7 +1232,10 @@ String attrib(String pred) :
   "[" ( <S> )* att=<IDENT> ( <S> )*
       ( ( "="           { cases = 1; }
          | <INCLUDES>  { cases = 2; }    
-         | <DASHMATCH> { cases = 3; } ) ( <S> )* 
+         | <DASHMATCH> { cases = 3; }
+         | <CARETMATCH> { cases = 4; }
+         | <DOLLARMATCH> { cases = 5; }
+         | <STARMATCH> { cases = 6; } ) ( <S> )* 
        ( val=<IDENT> { attValue = val.image; }
          | val=<STRING> { attValue = val.image; }
        )
@@ -1251,6 +1257,15 @@ String attrib(String pred) :
          case 3:
          c = name + "|=" +attValue;
          break;
+         case 4:
+         c = name + "^=" +attValue;
+         break;
+         case 5:
+         c = name + "$=" +attValue;
+         break;
+         case 6:
+         c = name + "*=" +attValue;
+         break;
          default:
          // never reached.
          c = null;
index e1585102a438f2dd552c9bfda63ab01c8d252e73..62b7bb490c3f9a40e0eb7aae1eed969f36bc9750 100644 (file)
@@ -27,195 +27,201 @@ public interface ParserConstants {
   /** RegularExpression Id. */
   int DASHMATCH = 14;
   /** RegularExpression Id. */
-  int INCLUDES = 15;
+  int CARETMATCH = 15;
   /** RegularExpression Id. */
-  int EQ = 16;
+  int DOLLARMATCH = 16;
   /** RegularExpression Id. */
-  int PLUS = 17;
+  int STARMATCH = 17;
   /** RegularExpression Id. */
-  int MINUS = 18;
+  int INCLUDES = 18;
   /** RegularExpression Id. */
-  int COMMA = 19;
+  int EQ = 19;
   /** RegularExpression Id. */
-  int SEMICOLON = 20;
+  int PLUS = 20;
   /** RegularExpression Id. */
-  int PRECEDES = 21;
+  int MINUS = 21;
   /** RegularExpression Id. */
-  int SUCCEEDS = 22;
+  int COMMA = 22;
   /** RegularExpression Id. */
-  int DIV = 23;
+  int SEMICOLON = 23;
   /** RegularExpression Id. */
-  int LBRACKET = 24;
+  int PRECEDES = 24;
   /** RegularExpression Id. */
-  int RBRACKET = 25;
+  int SUCCEEDS = 25;
   /** RegularExpression Id. */
-  int ANY = 26;
+  int DIV = 26;
   /** RegularExpression Id. */
-  int PARENT = 27;
+  int LBRACKET = 27;
   /** RegularExpression Id. */
-  int DOT = 28;
+  int RBRACKET = 28;
   /** RegularExpression Id. */
-  int LPARAN = 29;
+  int ANY = 29;
   /** RegularExpression Id. */
-  int RPARAN = 30;
+  int PARENT = 30;
   /** RegularExpression Id. */
-  int COMPARE = 31;
+  int DOT = 31;
   /** RegularExpression Id. */
-  int OR = 32;
+  int LPARAN = 32;
   /** RegularExpression Id. */
-  int AND = 33;
+  int RPARAN = 33;
   /** RegularExpression Id. */
-  int NOT_EQ = 34;
+  int COMPARE = 34;
   /** RegularExpression Id. */
-  int COLON = 35;
+  int OR = 35;
   /** RegularExpression Id. */
-  int INTERPOLATION = 36;
+  int AND = 36;
   /** RegularExpression Id. */
-  int NONASCII = 37;
+  int NOT_EQ = 37;
   /** RegularExpression Id. */
-  int H = 38;
+  int COLON = 38;
   /** RegularExpression Id. */
-  int UNICODE = 39;
+  int INTERPOLATION = 39;
   /** RegularExpression Id. */
-  int ESCAPE = 40;
+  int NONASCII = 40;
   /** RegularExpression Id. */
-  int NMSTART = 41;
+  int H = 41;
   /** RegularExpression Id. */
-  int NMCHAR = 42;
+  int UNICODE = 42;
   /** RegularExpression Id. */
-  int STRINGCHAR = 43;
+  int ESCAPE = 43;
   /** RegularExpression Id. */
-  int D = 44;
+  int NMSTART = 44;
   /** RegularExpression Id. */
-  int NAME = 45;
+  int NMCHAR = 45;
   /** RegularExpression Id. */
-  int TO = 46;
+  int STRINGCHAR = 46;
   /** RegularExpression Id. */
-  int THROUGH = 47;
+  int D = 47;
   /** RegularExpression Id. */
-  int EACH_IN = 48;
+  int NAME = 48;
   /** RegularExpression Id. */
-  int MIXIN_SYM = 49;
+  int TO = 49;
   /** RegularExpression Id. */
-  int INCLUDE_SYM = 50;
+  int THROUGH = 50;
   /** RegularExpression Id. */
-  int FUNCTION_SYM = 51;
+  int EACH_IN = 51;
   /** RegularExpression Id. */
-  int RETURN_SYM = 52;
+  int MIXIN_SYM = 52;
   /** RegularExpression Id. */
-  int DEBUG_SYM = 53;
+  int INCLUDE_SYM = 53;
   /** RegularExpression Id. */
-  int WARN_SYM = 54;
+  int FUNCTION_SYM = 54;
   /** RegularExpression Id. */
-  int FOR_SYM = 55;
+  int RETURN_SYM = 55;
   /** RegularExpression Id. */
-  int EACH_SYM = 56;
+  int DEBUG_SYM = 56;
   /** RegularExpression Id. */
-  int WHILE_SYM = 57;
+  int WARN_SYM = 57;
   /** RegularExpression Id. */
-  int IF_SYM = 58;
+  int FOR_SYM = 58;
   /** RegularExpression Id. */
-  int ELSE_SYM = 59;
+  int EACH_SYM = 59;
   /** RegularExpression Id. */
-  int EXTEND_SYM = 60;
+  int WHILE_SYM = 60;
   /** RegularExpression Id. */
-  int MOZ_DOCUMENT_SYM = 61;
+  int IF_SYM = 61;
   /** RegularExpression Id. */
-  int SUPPORTS_SYM = 62;
+  int ELSE_SYM = 62;
   /** RegularExpression Id. */
-  int MICROSOFT_RULE = 63;
+  int EXTEND_SYM = 63;
   /** RegularExpression Id. */
-  int IF = 64;
+  int MOZ_DOCUMENT_SYM = 64;
   /** RegularExpression Id. */
-  int GUARDED_SYM = 65;
+  int SUPPORTS_SYM = 65;
   /** RegularExpression Id. */
-  int STRING = 66;
+  int MICROSOFT_RULE = 66;
   /** RegularExpression Id. */
-  int IDENT = 67;
+  int IF = 67;
   /** RegularExpression Id. */
-  int NUMBER = 68;
+  int GUARDED_SYM = 68;
   /** RegularExpression Id. */
-  int _URL = 69;
+  int STRING = 69;
   /** RegularExpression Id. */
-  int URL = 70;
+  int IDENT = 70;
   /** RegularExpression Id. */
-  int VARIABLE = 71;
+  int NUMBER = 71;
   /** RegularExpression Id. */
-  int PERCENTAGE = 72;
+  int _URL = 72;
   /** RegularExpression Id. */
-  int PT = 73;
+  int URL = 73;
   /** RegularExpression Id. */
-  int MM = 74;
+  int VARIABLE = 74;
   /** RegularExpression Id. */
-  int CM = 75;
+  int PERCENTAGE = 75;
   /** RegularExpression Id. */
-  int PC = 76;
+  int PT = 76;
   /** RegularExpression Id. */
-  int IN = 77;
+  int MM = 77;
   /** RegularExpression Id. */
-  int PX = 78;
+  int CM = 78;
   /** RegularExpression Id. */
-  int EMS = 79;
+  int PC = 79;
   /** RegularExpression Id. */
-  int EXS = 80;
+  int IN = 80;
   /** RegularExpression Id. */
-  int DEG = 81;
+  int PX = 81;
   /** RegularExpression Id. */
-  int RAD = 82;
+  int EMS = 82;
   /** RegularExpression Id. */
-  int GRAD = 83;
+  int EXS = 83;
   /** RegularExpression Id. */
-  int MS = 84;
+  int DEG = 84;
   /** RegularExpression Id. */
-  int SECOND = 85;
+  int RAD = 85;
   /** RegularExpression Id. */
-  int HZ = 86;
+  int GRAD = 86;
   /** RegularExpression Id. */
-  int KHZ = 87;
+  int MS = 87;
   /** RegularExpression Id. */
-  int DIMEN = 88;
+  int SECOND = 88;
   /** RegularExpression Id. */
-  int HASH = 89;
+  int HZ = 89;
   /** RegularExpression Id. */
-  int IMPORT_SYM = 90;
+  int KHZ = 90;
   /** RegularExpression Id. */
-  int MEDIA_SYM = 91;
+  int DIMEN = 91;
   /** RegularExpression Id. */
-  int CHARSET_SYM = 92;
+  int HASH = 92;
   /** RegularExpression Id. */
-  int PAGE_SYM = 93;
+  int IMPORT_SYM = 93;
   /** RegularExpression Id. */
-  int FONT_FACE_SYM = 94;
+  int MEDIA_SYM = 94;
   /** RegularExpression Id. */
-  int ATKEYWORD = 95;
+  int CHARSET_SYM = 95;
   /** RegularExpression Id. */
-  int IMPORTANT_SYM = 96;
+  int PAGE_SYM = 96;
   /** RegularExpression Id. */
-  int RANGE0 = 97;
+  int FONT_FACE_SYM = 97;
   /** RegularExpression Id. */
-  int RANGE1 = 98;
+  int ATKEYWORD = 98;
   /** RegularExpression Id. */
-  int RANGE2 = 99;
+  int IMPORTANT_SYM = 99;
   /** RegularExpression Id. */
-  int RANGE3 = 100;
+  int RANGE0 = 100;
   /** RegularExpression Id. */
-  int RANGE4 = 101;
+  int RANGE1 = 101;
   /** RegularExpression Id. */
-  int RANGE5 = 102;
+  int RANGE2 = 102;
   /** RegularExpression Id. */
-  int RANGE6 = 103;
+  int RANGE3 = 103;
   /** RegularExpression Id. */
-  int RANGE = 104;
+  int RANGE4 = 104;
   /** RegularExpression Id. */
-  int UNI = 105;
+  int RANGE5 = 105;
   /** RegularExpression Id. */
-  int UNICODERANGE = 106;
+  int RANGE6 = 106;
   /** RegularExpression Id. */
-  int REMOVE = 107;
+  int RANGE = 107;
   /** RegularExpression Id. */
-  int FUNCTION = 108;
+  int UNI = 108;
   /** RegularExpression Id. */
-  int UNKNOWN = 109;
+  int UNICODERANGE = 109;
+  /** RegularExpression Id. */
+  int REMOVE = 110;
+  /** RegularExpression Id. */
+  int FUNCTION = 111;
+  /** RegularExpression Id. */
+  int UNKNOWN = 112;
 
   /** Lexical state. */
   int DEFAULT = 0;
@@ -243,6 +249,9 @@ public interface ParserConstants {
     "\"{\"",
     "\"}\"",
     "\"|=\"",
+    "\"^=\"",
+    "\"$=\"",
+    "\"*=\"",
     "\"~=\"",
     "\"=\"",
     "\"+\"",
index 025bcaae8f124207e064420c042eb1c47ed9d4d7..e3029206a6ada3fb30e6feb5cae80446beb0366f 100644 (file)
@@ -37,168 +37,170 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
    switch (pos)
    {
       case 0:
-         if ((active0 & 0x7ffe000000000000L) != 0L || (active1 & 0x7c000000L) != 0L)
+         if ((active0 & 0xfff0000000000000L) != 0L || (active1 & 0x3e0000003L) != 0L)
             return 111;
-         if ((active0 & 0x400000000L) != 0L)
+         if ((active0 & 0x2000000000L) != 0L)
             return 423;
-         if ((active0 & 0x40800L) != 0L)
+         if ((active0 & 0x200800L) != 0L)
             return 42;
-         if ((active0 & 0x10000000L) != 0L)
+         if ((active0 & 0x10000L) != 0L)
+            return 79;
+         if ((active0 & 0x80000000L) != 0L)
             return 424;
-         if ((active0 & 0x1c00000000000L) != 0L || (active1 & 0x1L) != 0L)
+         if ((active0 & 0x4000044L) != 0L)
+            return 3;
+         if ((active0 & 0xe000000000000L) != 0L || (active1 & 0x8L) != 0L)
          {
-            jjmatchedKind = 67;
+            jjmatchedKind = 70;
             return 425;
          }
-         if ((active0 & 0x800044L) != 0L)
-            return 3;
          return -1;
       case 1:
-         if ((active0 & 0x2000000000000000L) != 0L)
-            return 112;
-         if ((active0 & 0x800000000000L) != 0L)
+         if ((active0 & 0x4000000000000L) != 0L)
          {
-            jjmatchedKind = 67;
+            jjmatchedKind = 70;
             jjmatchedPos = 1;
             return 425;
          }
-         if ((active0 & 0x1400000000000L) != 0L || (active1 & 0x1L) != 0L)
+         if ((active1 & 0x1L) != 0L)
+            return 112;
+         if ((active0 & 0xa000000000000L) != 0L || (active1 & 0x8L) != 0L)
             return 425;
-         if ((active0 & 0x40L) != 0L)
-            return 1;
-         if ((active0 & 0x5ffe000000000000L) != 0L || (active1 & 0x7c000000L) != 0L)
+         if ((active0 & 0xfff0000000000000L) != 0L || (active1 & 0x3e0000002L) != 0L)
          {
-            jjmatchedKind = 95;
+            jjmatchedKind = 98;
             jjmatchedPos = 1;
             return 426;
          }
+         if ((active0 & 0x40L) != 0L)
+            return 1;
          return -1;
       case 2:
-         if ((active0 & 0x400000000000000L) != 0L)
-            return 426;
-         if ((active0 & 0x7bfe000000000000L) != 0L || (active1 & 0x7c000000L) != 0L)
+         if ((active0 & 0xdff0000000000000L) != 0L || (active1 & 0x3e0000003L) != 0L)
          {
-            jjmatchedKind = 95;
+            jjmatchedKind = 98;
             jjmatchedPos = 2;
             return 426;
          }
-         if ((active0 & 0x800000000000L) != 0L)
+         if ((active0 & 0x2000000000000000L) != 0L)
+            return 426;
+         if ((active0 & 0x4000000000000L) != 0L)
          {
-            jjmatchedKind = 67;
+            jjmatchedKind = 70;
             jjmatchedPos = 2;
             return 425;
          }
          return -1;
       case 3:
-         if ((active0 & 0x800000000000L) != 0L)
+         if ((active0 & 0xdbf0000000000000L) != 0L || (active1 & 0x3e0000003L) != 0L)
          {
-            jjmatchedKind = 67;
+            jjmatchedKind = 98;
             jjmatchedPos = 3;
-            return 425;
+            return 426;
          }
-         if ((active0 & 0x7b7e000000000000L) != 0L || (active1 & 0x7c000000L) != 0L)
+         if ((active0 & 0x4000000000000L) != 0L)
          {
-            jjmatchedKind = 95;
+            jjmatchedKind = 70;
             jjmatchedPos = 3;
-            return 426;
+            return 425;
          }
-         if ((active0 & 0x80000000000000L) != 0L)
+         if ((active0 & 0x400000000000000L) != 0L)
             return 426;
          return -1;
       case 4:
-         if ((active0 & 0x723e000000000000L) != 0L || (active1 & 0x5c000000L) != 0L)
+         if ((active0 & 0x91f0000000000000L) != 0L || (active1 & 0x2e0000003L) != 0L)
          {
-            jjmatchedKind = 95;
+            jjmatchedKind = 98;
             jjmatchedPos = 4;
             return 426;
          }
-         if ((active0 & 0x940000000000000L) != 0L || (active1 & 0x20000000L) != 0L)
+         if ((active0 & 0x4a00000000000000L) != 0L || (active1 & 0x100000000L) != 0L)
             return 426;
-         if ((active0 & 0x800000000000L) != 0L)
+         if ((active0 & 0x4000000000000L) != 0L)
          {
-            jjmatchedKind = 67;
+            jjmatchedKind = 70;
             jjmatchedPos = 4;
             return 425;
          }
          return -1;
       case 5:
-         if ((active0 & 0x701c000000000000L) != 0L || (active1 & 0x54000000L) != 0L)
+         if ((active0 & 0x4000000000000L) != 0L)
          {
-            jjmatchedKind = 95;
+            jjmatchedKind = 70;
             jjmatchedPos = 5;
-            return 426;
+            return 425;
          }
-         if ((active0 & 0x800000000000L) != 0L)
+         if ((active0 & 0x1110000000000000L) != 0L || (active1 & 0x40000000L) != 0L)
+            return 426;
+         if ((active0 & 0x80e0000000000000L) != 0L || (active1 & 0x2a0000003L) != 0L)
          {
-            jjmatchedKind = 67;
+            jjmatchedKind = 98;
             jjmatchedPos = 5;
-            return 425;
-         }
-         if ((active0 & 0x222000000000000L) != 0L || (active1 & 0x8000000L) != 0L)
             return 426;
+         }
          return -1;
       case 6:
-         if ((active0 & 0x800000000000L) != 0L)
+         if ((active0 & 0x4000000000000L) != 0L)
             return 425;
-         if ((active0 & 0x1010000000000000L) != 0L || (active1 & 0x4000000L) != 0L)
+         if ((active0 & 0x8080000000000000L) != 0L || (active1 & 0x20000000L) != 0L)
             return 426;
-         if ((active0 & 0x600c000000000000L) != 0L || (active1 & 0x50000000L) != 0L)
+         if ((active0 & 0x60000000000000L) != 0L || (active1 & 0x280000003L) != 0L)
          {
-            jjmatchedKind = 95;
+            jjmatchedKind = 98;
             jjmatchedPos = 6;
             return 426;
          }
          return -1;
       case 7:
-         if ((active0 & 0x4000000000000L) != 0L || (active1 & 0x10000000L) != 0L)
+         if ((active0 & 0x20000000000000L) != 0L || (active1 & 0x80000000L) != 0L)
             return 426;
-         if ((active0 & 0x6008000000000000L) != 0L || (active1 & 0x40000000L) != 0L)
+         if ((active0 & 0x40000000000000L) != 0L || (active1 & 0x200000003L) != 0L)
          {
-            jjmatchedKind = 95;
+            jjmatchedKind = 98;
             jjmatchedPos = 7;
             return 426;
          }
          return -1;
       case 8:
-         if ((active0 & 0x4008000000000000L) != 0L)
-            return 426;
-         if ((active0 & 0x2000000000000000L) != 0L || (active1 & 0x40000000L) != 0L)
+         if ((active1 & 0x200000001L) != 0L)
          {
-            jjmatchedKind = 95;
+            jjmatchedKind = 98;
             jjmatchedPos = 8;
             return 426;
          }
+         if ((active0 & 0x40000000000000L) != 0L || (active1 & 0x2L) != 0L)
+            return 426;
          return -1;
       case 9:
-         if ((active1 & 0x40000000L) != 0L)
-            return 426;
-         if ((active0 & 0x2000000000000000L) != 0L)
+         if ((active1 & 0x1L) != 0L)
          {
-            jjmatchedKind = 95;
+            jjmatchedKind = 98;
             jjmatchedPos = 9;
             return 426;
          }
+         if ((active1 & 0x200000000L) != 0L)
+            return 426;
          return -1;
       case 10:
-         if ((active0 & 0x2000000000000000L) != 0L)
+         if ((active1 & 0x1L) != 0L)
          {
-            jjmatchedKind = 95;
+            jjmatchedKind = 98;
             jjmatchedPos = 10;
             return 426;
          }
          return -1;
       case 11:
-         if ((active0 & 0x2000000000000000L) != 0L)
+         if ((active1 & 0x1L) != 0L)
          {
-            jjmatchedKind = 95;
+            jjmatchedKind = 98;
             jjmatchedPos = 11;
             return 426;
          }
          return -1;
       case 12:
-         if ((active0 & 0x2000000000000000L) != 0L)
+         if ((active1 & 0x1L) != 0L)
          {
-            jjmatchedKind = 95;
+            jjmatchedKind = 98;
             jjmatchedPos = 12;
             return 426;
          }
@@ -222,60 +224,65 @@ private int jjMoveStringLiteralDfa0_0()
    switch(curChar)
    {
       case 33:
-         return jjMoveStringLiteralDfa1_0(0x400000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x2000000000L, 0x0L);
+      case 36:
+         return jjMoveStringLiteralDfa1_0(0x10000L, 0x0L);
       case 38:
-         jjmatchedKind = 27;
-         return jjMoveStringLiteralDfa1_0(0x200000000L, 0x0L);
+         jjmatchedKind = 30;
+         return jjMoveStringLiteralDfa1_0(0x1000000000L, 0x0L);
       case 40:
-         return jjStopAtPos(0, 29);
+         return jjStopAtPos(0, 32);
       case 41:
-         return jjStopAtPos(0, 30);
+         return jjStopAtPos(0, 33);
       case 42:
-         return jjStopAtPos(0, 26);
+         jjmatchedKind = 29;
+         return jjMoveStringLiteralDfa1_0(0x20000L, 0x0L);
       case 43:
-         return jjStopAtPos(0, 17);
+         return jjStopAtPos(0, 20);
       case 44:
-         return jjStopAtPos(0, 19);
+         return jjStopAtPos(0, 22);
       case 45:
-         jjmatchedKind = 18;
+         jjmatchedKind = 21;
          return jjMoveStringLiteralDfa1_0(0x800L, 0x0L);
       case 46:
-         return jjStartNfaWithStates_0(0, 28, 424);
+         return jjStartNfaWithStates_0(0, 31, 424);
       case 47:
-         jjmatchedKind = 23;
+         jjmatchedKind = 26;
          return jjMoveStringLiteralDfa1_0(0x44L, 0x0L);
       case 58:
-         return jjStopAtPos(0, 35);
+         return jjStopAtPos(0, 38);
       case 59:
-         return jjStopAtPos(0, 20);
+         return jjStopAtPos(0, 23);
       case 60:
-         jjmatchedKind = 22;
+         jjmatchedKind = 25;
          return jjMoveStringLiteralDfa1_0(0x400L, 0x0L);
       case 61:
-         jjmatchedKind = 16;
-         return jjMoveStringLiteralDfa1_0(0x80000000L, 0x0L);
+         jjmatchedKind = 19;
+         return jjMoveStringLiteralDfa1_0(0x400000000L, 0x0L);
       case 62:
-         return jjStopAtPos(0, 21);
+         return jjStopAtPos(0, 24);
       case 64:
-         return jjMoveStringLiteralDfa1_0(0x7ffe000000000000L, 0x7c000000L);
+         return jjMoveStringLiteralDfa1_0(0xfff0000000000000L, 0x3e0000003L);
       case 91:
-         return jjStopAtPos(0, 24);
+         return jjStopAtPos(0, 27);
       case 93:
-         return jjStopAtPos(0, 25);
+         return jjStopAtPos(0, 28);
+      case 94:
+         return jjMoveStringLiteralDfa1_0(0x8000L, 0x0L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa1_0(0x1000000000000L, 0x1L);
+         return jjMoveStringLiteralDfa1_0(0x8000000000000L, 0x8L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa1_0(0xc00000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x6000000000000L, 0x0L);
       case 123:
          return jjStopAtPos(0, 12);
       case 124:
-         return jjMoveStringLiteralDfa1_0(0x100004000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x800004000L, 0x0L);
       case 125:
          return jjStopAtPos(0, 13);
       case 126:
-         return jjMoveStringLiteralDfa1_0(0x8000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x40000L, 0x0L);
       default :
          return jjMoveNfa_0(4, 0);
    }
@@ -292,15 +299,15 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1)
       case 33:
          return jjMoveStringLiteralDfa2_0(active0, 0x400L, active1, 0L);
       case 38:
-         if ((active0 & 0x200000000L) != 0L)
-            return jjStopAtPos(1, 33);
+         if ((active0 & 0x1000000000L) != 0L)
+            return jjStopAtPos(1, 36);
          break;
       case 42:
          if ((active0 & 0x40L) != 0L)
             return jjStartNfaWithStates_0(1, 6, 1);
          break;
       case 45:
-         return jjMoveStringLiteralDfa2_0(active0, 0x2000000000000800L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x800L, active1, 0x1L);
       case 47:
          if ((active0 & 0x4L) != 0L)
             return jjStopAtPos(1, 2);
@@ -310,59 +317,65 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1)
             return jjStopAtPos(1, 14);
          else if ((active0 & 0x8000L) != 0L)
             return jjStopAtPos(1, 15);
-         else if ((active0 & 0x80000000L) != 0L)
-            return jjStopAtPos(1, 31);
+         else if ((active0 & 0x10000L) != 0L)
+            return jjStopAtPos(1, 16);
+         else if ((active0 & 0x20000L) != 0L)
+            return jjStopAtPos(1, 17);
+         else if ((active0 & 0x40000L) != 0L)
+            return jjStopAtPos(1, 18);
          else if ((active0 & 0x400000000L) != 0L)
             return jjStopAtPos(1, 34);
+         else if ((active0 & 0x2000000000L) != 0L)
+            return jjStopAtPos(1, 37);
          break;
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x10000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x80000000L);
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa2_0(active0, 0x20000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x100000000000000L, active1, 0L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa2_0(active0, 0x1900000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0xc800000000000000L, active1, 0L);
       case 70:
       case 102:
-         if ((active1 & 0x1L) != 0L)
-            return jjStartNfaWithStates_0(1, 64, 425);
-         return jjMoveStringLiteralDfa2_0(active0, 0x88000000000000L, active1, 0x40000000L);
+         if ((active1 & 0x8L) != 0L)
+            return jjStartNfaWithStates_0(1, 67, 425);
+         return jjMoveStringLiteralDfa2_0(active0, 0x440000000000000L, active1, 0x200000000L);
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa2_0(active0, 0x800000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x4000000000000L, active1, 0L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa2_0(active0, 0x404000000000000L, active1, 0x4000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x2020000000000000L, active1, 0x20000000L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa2_0(active0, 0x2000000000000L, active1, 0x8000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x10000000000000L, active1, 0x40000000L);
       case 78:
       case 110:
-         if ((active0 & 0x1000000000000L) != 0L)
-            return jjStartNfaWithStates_0(1, 48, 425);
+         if ((active0 & 0x8000000000000L) != 0L)
+            return jjStartNfaWithStates_0(1, 51, 425);
          break;
       case 79:
       case 111:
-         if ((active0 & 0x400000000000L) != 0L)
-            return jjStartNfaWithStates_0(1, 46, 425);
+         if ((active0 & 0x2000000000000L) != 0L)
+            return jjStartNfaWithStates_0(1, 49, 425);
          break;
       case 80:
       case 112:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x20000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x100000000L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa2_0(active0, 0x10000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x80000000000000L, active1, 0L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa2_0(active0, 0x4000000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x2L);
       case 87:
       case 119:
-         return jjMoveStringLiteralDfa2_0(active0, 0x240000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x1200000000000000L, active1, 0L);
       case 124:
-         if ((active0 & 0x100000000L) != 0L)
-            return jjStopAtPos(1, 32);
+         if ((active0 & 0x800000000L) != 0L)
+            return jjStopAtPos(1, 35);
          break;
       default :
          break;
@@ -388,42 +401,42 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
          break;
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa3_0(active0, 0x140000000000000L, active1, 0x20000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0xa00000000000000L, active1, 0x100000000L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa3_0(active0, 0x30000000000000L, active1, 0x8000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x180000000000000L, active1, 0x40000000L);
       case 70:
       case 102:
-         if ((active0 & 0x400000000000000L) != 0L)
-            return jjStartNfaWithStates_0(2, 58, 426);
+         if ((active0 & 0x2000000000000000L) != 0L)
+            return jjStartNfaWithStates_0(2, 61, 426);
          break;
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa3_0(active0, 0x200000000000000L, active1, 0x10000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1000000000000000L, active1, 0x80000000L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa3_0(active0, 0x2000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x10000000000000L, active1, 0L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa3_0(active0, 0x800000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000000L, active1, 0L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa3_0(active0, 0x2000000000000000L, active1, 0x4000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x20000001L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x20000000000000L, active1, 0L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa3_0(active0, 0x80000000000000L, active1, 0x40000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x400000000000000L, active1, 0x200000000L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa3_0(active0, 0x800000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000L, active1, 0L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa3_0(active0, 0x4008000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x40000000000000L, active1, 0x2L);
       case 88:
       case 120:
-         return jjMoveStringLiteralDfa3_0(active0, 0x1000000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000000L, active1, 0L);
       default :
          break;
    }
@@ -446,45 +459,45 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long a
          break;
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x10000000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x80000000L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa4_0(active0, 0x20000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x100000000000000L, active1, 0L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa4_0(active0, 0x104000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x820000000000000L, active1, 0L);
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x8000000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x40000000L);
       case 71:
       case 103:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x20000000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x100000000L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa4_0(active0, 0x200000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x1000000000000000L, active1, 0L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa4_0(active0, 0x8000000000000L, active1, 0x40000000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x40000000000000L, active1, 0x200000000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa4_0(active0, 0x2000800000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000L, active1, 0x1L);
       case 80:
       case 112:
-         return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000000L, active1, 0x4000000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x20000002L);
       case 82:
       case 114:
-         if ((active0 & 0x80000000000000L) != 0L)
-            return jjStartNfaWithStates_0(3, 55, 426);
-         return jjMoveStringLiteralDfa4_0(active0, 0x40000000000000L, active1, 0L);
+         if ((active0 & 0x400000000000000L) != 0L)
+            return jjStartNfaWithStates_0(3, 58, 426);
+         return jjMoveStringLiteralDfa4_0(active0, 0x200000000000000L, active1, 0L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa4_0(active0, 0x800000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000000L, active1, 0L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa4_0(active0, 0x1010000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x8080000000000000L, active1, 0L);
       case 88:
       case 120:
-         return jjMoveStringLiteralDfa4_0(active0, 0x2000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x10000000000000L, active1, 0L);
       default :
          break;
    }
@@ -503,48 +516,48 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
    {
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa5_0(active0, 0x8000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x40000000000000L, active1, 0L);
       case 69:
       case 101:
-         if ((active0 & 0x800000000000000L) != 0L)
-            return jjStartNfaWithStates_0(4, 59, 426);
-         else if ((active1 & 0x20000000L) != 0L)
-            return jjStartNfaWithStates_0(4, 93, 426);
-         return jjMoveStringLiteralDfa5_0(active0, 0x1000000000000000L, active1, 0L);
+         if ((active0 & 0x4000000000000000L) != 0L)
+            return jjStartNfaWithStates_0(4, 62, 426);
+         else if ((active1 & 0x100000000L) != 0L)
+            return jjStartNfaWithStates_0(4, 96, 426);
+         return jjMoveStringLiteralDfa5_0(active0, 0x8000000000000000L, active1, 0L);
       case 72:
       case 104:
-         if ((active0 & 0x100000000000000L) != 0L)
-            return jjStartNfaWithStates_0(4, 56, 426);
+         if ((active0 & 0x800000000000000L) != 0L)
+            return jjStartNfaWithStates_0(4, 59, 426);
          break;
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa5_0(active0, 0x2000000000000L, active1, 0x8000000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x10000000000000L, active1, 0x40000000L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa5_0(active0, 0x204000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x1020000000000000L, active1, 0L);
       case 78:
       case 110:
-         if ((active0 & 0x40000000000000L) != 0L)
-            return jjStartNfaWithStates_0(4, 54, 426);
+         if ((active0 & 0x200000000000000L) != 0L)
+            return jjStartNfaWithStates_0(4, 57, 426);
          break;
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x4000000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x20000000L);
       case 80:
       case 112:
-         return jjMoveStringLiteralDfa5_0(active0, 0x4000000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x2L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x10000000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x80000000L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x40000000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x200000000L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa5_0(active0, 0x30800000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x184000000000000L, active1, 0L);
       case 90:
       case 122:
-         return jjMoveStringLiteralDfa5_0(active0, 0x2000000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x1L);
       default :
          break;
    }
@@ -562,42 +575,42 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
    switch(curChar)
    {
       case 45:
-         return jjMoveStringLiteralDfa6_0(active0, 0x2000000000000000L, active1, 0x40000000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x200000001L);
       case 65:
       case 97:
-         if ((active1 & 0x8000000L) != 0L)
-            return jjStartNfaWithStates_0(5, 91, 426);
+         if ((active1 & 0x40000000L) != 0L)
+            return jjStartNfaWithStates_0(5, 94, 426);
          break;
       case 69:
       case 101:
-         if ((active0 & 0x200000000000000L) != 0L)
-            return jjStartNfaWithStates_0(5, 57, 426);
+         if ((active0 & 0x1000000000000000L) != 0L)
+            return jjStartNfaWithStates_0(5, 60, 426);
          break;
       case 71:
       case 103:
-         if ((active0 & 0x20000000000000L) != 0L)
-            return jjStartNfaWithStates_0(5, 53, 426);
-         return jjMoveStringLiteralDfa6_0(active0, 0x800000000000L, active1, 0L);
+         if ((active0 & 0x100000000000000L) != 0L)
+            return jjStartNfaWithStates_0(5, 56, 426);
+         return jjMoveStringLiteralDfa6_0(active0, 0x4000000000000L, active1, 0L);
       case 78:
       case 110:
-         if ((active0 & 0x2000000000000L) != 0L)
-            return jjStartNfaWithStates_0(5, 49, 426);
-         return jjMoveStringLiteralDfa6_0(active0, 0x1000000000000000L, active1, 0L);
+         if ((active0 & 0x10000000000000L) != 0L)
+            return jjStartNfaWithStates_0(5, 52, 426);
+         return jjMoveStringLiteralDfa6_0(active0, 0x8000000000000000L, active1, 0L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa6_0(active0, 0x4000000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x2L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa6_0(active0, 0x10000000000000L, active1, 0x4000000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x80000000000000L, active1, 0x20000000L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x10000000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x80000000L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa6_0(active0, 0x8000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x40000000000000L, active1, 0L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa6_0(active0, 0x4000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x20000000000000L, active1, 0L);
       default :
          break;
    }
@@ -616,35 +629,35 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0, long old1, long a
    {
       case 68:
       case 100:
-         if ((active0 & 0x1000000000000000L) != 0L)
-            return jjStartNfaWithStates_0(6, 60, 426);
-         return jjMoveStringLiteralDfa7_0(active0, 0x2004000000000000L, active1, 0L);
+         if ((active0 & 0x8000000000000000L) != 0L)
+            return jjStartNfaWithStates_0(6, 63, 426);
+         return jjMoveStringLiteralDfa7_0(active0, 0x20000000000000L, active1, 0x1L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x10000000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x80000000L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x40000000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x200000000L);
       case 72:
       case 104:
-         if ((active0 & 0x800000000000L) != 0L)
-            return jjStartNfaWithStates_0(6, 47, 425);
+         if ((active0 & 0x4000000000000L) != 0L)
+            return jjStartNfaWithStates_0(6, 50, 425);
          break;
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa7_0(active0, 0x8000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x40000000000000L, active1, 0L);
       case 78:
       case 110:
-         if ((active0 & 0x10000000000000L) != 0L)
-            return jjStartNfaWithStates_0(6, 52, 426);
+         if ((active0 & 0x80000000000000L) != 0L)
+            return jjStartNfaWithStates_0(6, 55, 426);
          break;
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa7_0(active0, 0x4000000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x2L);
       case 84:
       case 116:
-         if ((active1 & 0x4000000L) != 0L)
-            return jjStartNfaWithStates_0(6, 90, 426);
+         if ((active1 & 0x20000000L) != 0L)
+            return jjStartNfaWithStates_0(6, 93, 426);
          break;
       default :
          break;
@@ -664,20 +677,20 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0, long old1, long a
    {
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x40000000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x200000000L);
       case 69:
       case 101:
-         if ((active0 & 0x4000000000000L) != 0L)
-            return jjStartNfaWithStates_0(7, 50, 426);
+         if ((active0 & 0x20000000000000L) != 0L)
+            return jjStartNfaWithStates_0(7, 53, 426);
          break;
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa8_0(active0, 0x2008000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x40000000000000L, active1, 0x1L);
       case 84:
       case 116:
-         if ((active1 & 0x10000000L) != 0L)
-            return jjStartNfaWithStates_0(7, 92, 426);
-         return jjMoveStringLiteralDfa8_0(active0, 0x4000000000000000L, active1, 0L);
+         if ((active1 & 0x80000000L) != 0L)
+            return jjStartNfaWithStates_0(7, 95, 426);
+         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x2L);
       default :
          break;
    }
@@ -696,16 +709,16 @@ private int jjMoveStringLiteralDfa8_0(long old0, long active0, long old1, long a
    {
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa9_0(active0, 0x2000000000000000L, active1, 0x40000000L);
+         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x200000001L);
       case 78:
       case 110:
-         if ((active0 & 0x8000000000000L) != 0L)
-            return jjStartNfaWithStates_0(8, 51, 426);
+         if ((active0 & 0x40000000000000L) != 0L)
+            return jjStartNfaWithStates_0(8, 54, 426);
          break;
       case 83:
       case 115:
-         if ((active0 & 0x4000000000000000L) != 0L)
-            return jjStartNfaWithStates_0(8, 62, 426);
+         if ((active1 & 0x2L) != 0L)
+            return jjStartNfaWithStates_0(8, 65, 426);
          break;
       default :
          break;
@@ -718,101 +731,101 @@ private int jjMoveStringLiteralDfa9_0(long old0, long active0, long old1, long a
       return jjStartNfa_0(7, old0, old1);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_0(8, active0, active1);
+      jjStopStringLiteralDfa_0(8, 0L, active1);
       return 9;
    }
    switch(curChar)
    {
       case 69:
       case 101:
-         if ((active1 & 0x40000000L) != 0L)
-            return jjStartNfaWithStates_0(9, 94, 426);
+         if ((active1 & 0x200000000L) != 0L)
+            return jjStartNfaWithStates_0(9, 97, 426);
          break;
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa10_0(active0, 0x2000000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa10_0(active1, 0x1L);
       default :
          break;
    }
-   return jjStartNfa_0(8, active0, active1);
+   return jjStartNfa_0(8, 0L, active1);
 }
-private int jjMoveStringLiteralDfa10_0(long old0, long active0, long old1, long active1)
+private int jjMoveStringLiteralDfa10_0(long old1, long active1)
 {
-   if (((active0 &= old0) | (active1 &= old1)) == 0L)
-      return jjStartNfa_0(8, old0, old1);
+   if (((active1 &= old1)) == 0L)
+      return jjStartNfa_0(8, 0L, old1);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_0(9, active0, 0L);
+      jjStopStringLiteralDfa_0(9, 0L, active1);
       return 10;
    }
    switch(curChar)
    {
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa11_0(active0, 0x2000000000000000L);
+         return jjMoveStringLiteralDfa11_0(active1, 0x1L);
       default :
          break;
    }
-   return jjStartNfa_0(9, active0, 0L);
+   return jjStartNfa_0(9, 0L, active1);
 }
-private int jjMoveStringLiteralDfa11_0(long old0, long active0)
+private int jjMoveStringLiteralDfa11_0(long old1, long active1)
 {
-   if (((active0 &= old0)) == 0L)
-      return jjStartNfa_0(9, old0, 0L);
+   if (((active1 &= old1)) == 0L)
+      return jjStartNfa_0(9, 0L, old1);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_0(10, active0, 0L);
+      jjStopStringLiteralDfa_0(10, 0L, active1);
       return 11;
    }
    switch(curChar)
    {
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa12_0(active0, 0x2000000000000000L);
+         return jjMoveStringLiteralDfa12_0(active1, 0x1L);
       default :
          break;
    }
-   return jjStartNfa_0(10, active0, 0L);
+   return jjStartNfa_0(10, 0L, active1);
 }
-private int jjMoveStringLiteralDfa12_0(long old0, long active0)
+private int jjMoveStringLiteralDfa12_0(long old1, long active1)
 {
-   if (((active0 &= old0)) == 0L)
-      return jjStartNfa_0(10, old0, 0L);
+   if (((active1 &= old1)) == 0L)
+      return jjStartNfa_0(10, 0L, old1);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_0(11, active0, 0L);
+      jjStopStringLiteralDfa_0(11, 0L, active1);
       return 12;
    }
    switch(curChar)
    {
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa13_0(active0, 0x2000000000000000L);
+         return jjMoveStringLiteralDfa13_0(active1, 0x1L);
       default :
          break;
    }
-   return jjStartNfa_0(11, active0, 0L);
+   return jjStartNfa_0(11, 0L, active1);
 }
-private int jjMoveStringLiteralDfa13_0(long old0, long active0)
+private int jjMoveStringLiteralDfa13_0(long old1, long active1)
 {
-   if (((active0 &= old0)) == 0L)
-      return jjStartNfa_0(11, old0, 0L);
+   if (((active1 &= old1)) == 0L)
+      return jjStartNfa_0(11, 0L, old1);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_0(12, active0, 0L);
+      jjStopStringLiteralDfa_0(12, 0L, active1);
       return 13;
    }
    switch(curChar)
    {
       case 84:
       case 116:
-         if ((active0 & 0x2000000000000000L) != 0L)
-            return jjStartNfaWithStates_0(13, 61, 426);
+         if ((active1 & 0x1L) != 0L)
+            return jjStartNfaWithStates_0(13, 64, 426);
          break;
       default :
          break;
    }
-   return jjStartNfa_0(12, active0, 0L);
+   return jjStartNfa_0(12, 0L, active1);
 }
 private int jjStartNfaWithStates_0(int pos, int kind, int state)
 {
@@ -846,8 +859,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 4:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 68)
-                        kind = 68;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddStates(0, 73);
                   }
                   else if ((0x100003600L & l) != 0L)
@@ -877,6 +890,10 @@ private int jjMoveNfa_0(int startState, int curPos)
                   else if (curChar == 35)
                      jjstateSet[jjnewStateCnt++] = 5;
                   break;
+               case 79:
+                  if (curChar == 45)
+                     jjCheckNAdd(80);
+                  break;
                case 424:
                   if ((0x3ff000000000000L & l) != 0L)
                      jjCheckNAddStates(110, 114);
@@ -914,8 +931,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                      jjCheckNAddTwoStates(187, 188);
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 68)
-                        kind = 68;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAdd(186);
                   }
                   break;
@@ -923,8 +940,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 113:
                   if ((0x3ff200000000000L & l) == 0L)
                      break;
-                  if (kind > 95)
-                     kind = 95;
+                  if (kind > 98)
+                     kind = 98;
                   jjCheckNAddTwoStates(113, 114);
                   break;
                case 425:
@@ -934,13 +951,13 @@ private int jjMoveNfa_0(int startState, int curPos)
                      jjCheckNAddTwoStates(151, 152);
                   else if (curChar == 40)
                   {
-                     if (kind > 108)
-                        kind = 108;
+                     if (kind > 111)
+                        kind = 111;
                   }
                   if ((0x3ff200000000000L & l) != 0L)
                   {
-                     if (kind > 67)
-                        kind = 67;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddTwoStates(140, 141);
                   }
                   break;
@@ -1062,8 +1079,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                      jjCheckNAddStates(106, 109);
                   break;
                case 46:
-                  if (curChar == 34 && kind > 66)
-                     kind = 66;
+                  if (curChar == 34 && kind > 69)
+                     kind = 69;
                   break;
                case 48:
                   if (curChar == 12)
@@ -1122,8 +1139,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                      jjCheckNAddStates(102, 105);
                   break;
                case 63:
-                  if (curChar == 39 && kind > 66)
-                     kind = 66;
+                  if (curChar == 39 && kind > 69)
+                     kind = 69;
                   break;
                case 65:
                   if (curChar == 12)
@@ -1177,113 +1194,109 @@ private int jjMoveNfa_0(int startState, int curPos)
                   if (curChar == 36)
                      jjCheckNAddStates(98, 101);
                   break;
-               case 79:
-                  if (curChar == 45)
-                     jjCheckNAdd(80);
-                  break;
                case 81:
                   if ((0x3ff200000000000L & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 74)
+                     kind = 74;
                   jjCheckNAddTwoStates(81, 82);
                   break;
                case 83:
                   if ((0xffffffff00000000L & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 74)
+                     kind = 74;
                   jjCheckNAddTwoStates(81, 82);
                   break;
                case 84:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 74)
+                     kind = 74;
                   jjCheckNAddStates(278, 281);
                   break;
                case 85:
                   if ((0x100003600L & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 74)
+                     kind = 74;
                   jjCheckNAddTwoStates(81, 82);
                   break;
                case 86:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 74)
+                     kind = 74;
                   jjCheckNAddStates(282, 288);
                   break;
                case 87:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 74)
+                     kind = 74;
                   jjCheckNAddStates(289, 291);
                   break;
                case 88:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 74)
+                     kind = 74;
                   jjCheckNAddStates(292, 295);
                   break;
                case 89:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 74)
+                     kind = 74;
                   jjCheckNAddStates(296, 300);
                   break;
                case 90:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 74)
+                     kind = 74;
                   jjCheckNAddStates(301, 306);
                   break;
                case 93:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 74)
+                     kind = 74;
                   jjCheckNAddStates(307, 310);
                   break;
                case 94:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 74)
+                     kind = 74;
                   jjCheckNAddStates(311, 317);
                   break;
                case 95:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 74)
+                     kind = 74;
                   jjCheckNAddStates(318, 320);
                   break;
                case 96:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 74)
+                     kind = 74;
                   jjCheckNAddStates(321, 324);
                   break;
                case 97:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 74)
+                     kind = 74;
                   jjCheckNAddStates(325, 329);
                   break;
                case 98:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 74)
+                     kind = 74;
                   jjCheckNAddStates(330, 335);
                   break;
                case 99:
@@ -1293,162 +1306,162 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 100:
                   if ((0x3ff200000000000L & l) == 0L)
                      break;
-                  if (kind > 89)
-                     kind = 89;
+                  if (kind > 92)
+                     kind = 92;
                   jjCheckNAddTwoStates(100, 101);
                   break;
                case 102:
                   if ((0xffffffff00000000L & l) == 0L)
                      break;
-                  if (kind > 89)
-                     kind = 89;
+                  if (kind > 92)
+                     kind = 92;
                   jjCheckNAddTwoStates(100, 101);
                   break;
                case 103:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 89)
-                     kind = 89;
+                  if (kind > 92)
+                     kind = 92;
                   jjCheckNAddStates(336, 339);
                   break;
                case 104:
                   if ((0x100003600L & l) == 0L)
                      break;
-                  if (kind > 89)
-                     kind = 89;
+                  if (kind > 92)
+                     kind = 92;
                   jjCheckNAddTwoStates(100, 101);
                   break;
                case 105:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 89)
-                     kind = 89;
+                  if (kind > 92)
+                     kind = 92;
                   jjCheckNAddStates(340, 346);
                   break;
                case 106:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 89)
-                     kind = 89;
+                  if (kind > 92)
+                     kind = 92;
                   jjCheckNAddStates(347, 349);
                   break;
                case 107:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 89)
-                     kind = 89;
+                  if (kind > 92)
+                     kind = 92;
                   jjCheckNAddStates(350, 353);
                   break;
                case 108:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 89)
-                     kind = 89;
+                  if (kind > 92)
+                     kind = 92;
                   jjCheckNAddStates(354, 358);
                   break;
                case 109:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 89)
-                     kind = 89;
+                  if (kind > 92)
+                     kind = 92;
                   jjCheckNAddStates(359, 364);
                   break;
                case 115:
                   if ((0xffffffff00000000L & l) == 0L)
                      break;
-                  if (kind > 95)
-                     kind = 95;
+                  if (kind > 98)
+                     kind = 98;
                   jjCheckNAddTwoStates(113, 114);
                   break;
                case 116:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 95)
-                     kind = 95;
+                  if (kind > 98)
+                     kind = 98;
                   jjCheckNAddStates(365, 368);
                   break;
                case 117:
                   if ((0x100003600L & l) == 0L)
                      break;
-                  if (kind > 95)
-                     kind = 95;
+                  if (kind > 98)
+                     kind = 98;
                   jjCheckNAddTwoStates(113, 114);
                   break;
                case 118:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 95)
-                     kind = 95;
+                  if (kind > 98)
+                     kind = 98;
                   jjCheckNAddStates(369, 375);
                   break;
                case 119:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 95)
-                     kind = 95;
+                  if (kind > 98)
+                     kind = 98;
                   jjCheckNAddStates(376, 378);
                   break;
                case 120:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 95)
-                     kind = 95;
+                  if (kind > 98)
+                     kind = 98;
                   jjCheckNAddStates(379, 382);
                   break;
                case 121:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 95)
-                     kind = 95;
+                  if (kind > 98)
+                     kind = 98;
                   jjCheckNAddStates(383, 387);
                   break;
                case 122:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 95)
-                     kind = 95;
+                  if (kind > 98)
+                     kind = 98;
                   jjCheckNAddStates(388, 393);
                   break;
                case 125:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 95)
-                     kind = 95;
+                  if (kind > 98)
+                     kind = 98;
                   jjCheckNAddStates(394, 397);
                   break;
                case 126:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 95)
-                     kind = 95;
+                  if (kind > 98)
+                     kind = 98;
                   jjCheckNAddStates(398, 404);
                   break;
                case 127:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 95)
-                     kind = 95;
+                  if (kind > 98)
+                     kind = 98;
                   jjCheckNAddStates(405, 407);
                   break;
                case 128:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 95)
-                     kind = 95;
+                  if (kind > 98)
+                     kind = 98;
                   jjCheckNAddStates(408, 411);
                   break;
                case 129:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 95)
-                     kind = 95;
+                  if (kind > 98)
+                     kind = 98;
                   jjCheckNAddStates(412, 416);
                   break;
                case 130:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 95)
-                     kind = 95;
+                  if (kind > 98)
+                     kind = 98;
                   jjCheckNAddStates(417, 422);
                   break;
                case 132:
@@ -1456,70 +1469,70 @@ private int jjMoveNfa_0(int startState, int curPos)
                      jjAddStates(423, 424);
                   break;
                case 133:
-                  if (curChar == 40 && kind > 107)
-                     kind = 107;
+                  if (curChar == 40 && kind > 110)
+                     kind = 110;
                   break;
                case 140:
                   if ((0x3ff200000000000L & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddTwoStates(140, 141);
                   break;
                case 142:
                   if ((0xffffffff00000000L & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddTwoStates(140, 141);
                   break;
                case 143:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddStates(425, 428);
                   break;
                case 144:
                   if ((0x100003600L & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddTwoStates(140, 141);
                   break;
                case 145:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddStates(429, 435);
                   break;
                case 146:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddStates(436, 438);
                   break;
                case 147:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddStates(439, 442);
                   break;
                case 148:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddStates(443, 447);
                   break;
                case 149:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddStates(448, 453);
                   break;
                case 150:
@@ -1531,8 +1544,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                      jjCheckNAddTwoStates(151, 152);
                   break;
                case 152:
-                  if (curChar == 40 && kind > 108)
-                     kind = 108;
+                  if (curChar == 40 && kind > 111)
+                     kind = 111;
                   break;
                case 154:
                   if ((0xffffffff00000000L & l) != 0L)
@@ -1590,8 +1603,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 186:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 68)
-                     kind = 68;
+                  if (kind > 71)
+                     kind = 71;
                   jjCheckNAdd(186);
                   break;
                case 187:
@@ -1599,8 +1612,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                      jjCheckNAddTwoStates(187, 188);
                   break;
                case 188:
-                  if (curChar == 37 && kind > 72)
-                     kind = 72;
+                  if (curChar == 37 && kind > 75)
+                     kind = 75;
                   break;
                case 189:
                   if ((0x3ff000000000000L & l) != 0L)
@@ -1673,106 +1686,106 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 241:
                   if ((0x3ff200000000000L & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 91)
+                     kind = 91;
                   jjCheckNAddTwoStates(241, 242);
                   break;
                case 243:
                   if ((0xffffffff00000000L & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 91)
+                     kind = 91;
                   jjCheckNAddTwoStates(241, 242);
                   break;
                case 244:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 91)
+                     kind = 91;
                   jjCheckNAddStates(489, 492);
                   break;
                case 245:
                   if ((0x100003600L & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 91)
+                     kind = 91;
                   jjCheckNAddTwoStates(241, 242);
                   break;
                case 246:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 91)
+                     kind = 91;
                   jjCheckNAddStates(493, 499);
                   break;
                case 247:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 91)
+                     kind = 91;
                   jjCheckNAddStates(500, 502);
                   break;
                case 248:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 91)
+                     kind = 91;
                   jjCheckNAddStates(503, 506);
                   break;
                case 249:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 91)
+                     kind = 91;
                   jjCheckNAddStates(507, 511);
                   break;
                case 250:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 91)
+                     kind = 91;
                   jjCheckNAddStates(512, 517);
                   break;
                case 253:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 91)
+                     kind = 91;
                   jjCheckNAddStates(518, 521);
                   break;
                case 254:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 91)
+                     kind = 91;
                   jjCheckNAddStates(522, 528);
                   break;
                case 255:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 91)
+                     kind = 91;
                   jjCheckNAddStates(529, 531);
                   break;
                case 256:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 91)
+                     kind = 91;
                   jjCheckNAddStates(532, 535);
                   break;
                case 257:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 91)
+                     kind = 91;
                   jjCheckNAddStates(536, 540);
                   break;
                case 258:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 91)
+                     kind = 91;
                   jjCheckNAddStates(541, 546);
                   break;
                case 260:
@@ -1788,8 +1801,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                      jjCheckNAddTwoStates(262, 263);
                   break;
                case 263:
-                  if (curChar == 41 && kind > 70)
-                     kind = 70;
+                  if (curChar == 41 && kind > 73)
+                     kind = 73;
                   break;
                case 265:
                   if ((0xffffffff00000000L & l) != 0L)
@@ -1954,20 +1967,20 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 311:
                   if (curChar != 63)
                      break;
-                  if (kind > 106)
-                     kind = 106;
+                  if (kind > 109)
+                     kind = 109;
                   jjstateSet[jjnewStateCnt++] = 312;
                   break;
                case 312:
                   if (curChar != 63)
                      break;
-                  if (kind > 106)
-                     kind = 106;
+                  if (kind > 109)
+                     kind = 109;
                   jjCheckNAddStates(691, 694);
                   break;
                case 313:
-                  if (curChar == 63 && kind > 106)
-                     kind = 106;
+                  if (curChar == 63 && kind > 109)
+                     kind = 109;
                   break;
                case 314:
                case 329:
@@ -1976,29 +1989,29 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 339:
                   if (curChar != 63)
                      break;
-                  if (kind > 106)
-                     kind = 106;
+                  if (kind > 109)
+                     kind = 109;
                   jjCheckNAdd(313);
                   break;
                case 315:
                   if (curChar != 63)
                      break;
-                  if (kind > 106)
-                     kind = 106;
+                  if (kind > 109)
+                     kind = 109;
                   jjCheckNAddTwoStates(313, 314);
                   break;
                case 316:
                   if (curChar != 63)
                      break;
-                  if (kind > 106)
-                     kind = 106;
+                  if (kind > 109)
+                     kind = 109;
                   jjCheckNAddStates(695, 697);
                   break;
                case 317:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 106)
-                     kind = 106;
+                  if (kind > 109)
+                     kind = 109;
                   jjAddStates(698, 703);
                   break;
                case 318:
@@ -2014,8 +2027,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                      jjCheckNAdd(321);
                   break;
                case 321:
-                  if ((0x3ff000000000000L & l) != 0L && kind > 106)
-                     kind = 106;
+                  if ((0x3ff000000000000L & l) != 0L && kind > 109)
+                     kind = 109;
                   break;
                case 322:
                   if ((0x3ff000000000000L & l) != 0L)
@@ -2032,8 +2045,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 325:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 106)
-                     kind = 106;
+                  if (kind > 109)
+                     kind = 109;
                   jjCheckNAdd(313);
                   break;
                case 326:
@@ -2047,8 +2060,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 328:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 106)
-                     kind = 106;
+                  if (kind > 109)
+                     kind = 109;
                   jjstateSet[jjnewStateCnt++] = 329;
                   break;
                case 330:
@@ -2058,57 +2071,57 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 331:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 106)
-                     kind = 106;
+                  if (kind > 109)
+                     kind = 109;
                   jjstateSet[jjnewStateCnt++] = 332;
                   break;
                case 332:
                   if (curChar != 63)
                      break;
-                  if (kind > 106)
-                     kind = 106;
+                  if (kind > 109)
+                     kind = 109;
                   jjCheckNAddTwoStates(313, 333);
                   break;
                case 334:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 106)
-                     kind = 106;
+                  if (kind > 109)
+                     kind = 109;
                   jjstateSet[jjnewStateCnt++] = 335;
                   break;
                case 335:
                   if (curChar != 63)
                      break;
-                  if (kind > 106)
-                     kind = 106;
+                  if (kind > 109)
+                     kind = 109;
                   jjCheckNAddStates(704, 706);
                   break;
                case 337:
                   if (curChar != 63)
                      break;
-                  if (kind > 106)
-                     kind = 106;
+                  if (kind > 109)
+                     kind = 109;
                   jjCheckNAddTwoStates(313, 336);
                   break;
                case 338:
                   if (curChar != 63)
                      break;
-                  if (kind > 106)
-                     kind = 106;
+                  if (kind > 109)
+                     kind = 109;
                   jjCheckNAddStates(707, 710);
                   break;
                case 340:
                   if (curChar != 63)
                      break;
-                  if (kind > 106)
-                     kind = 106;
+                  if (kind > 109)
+                     kind = 109;
                   jjCheckNAddTwoStates(313, 339);
                   break;
                case 341:
                   if (curChar != 63)
                      break;
-                  if (kind > 106)
-                     kind = 106;
+                  if (kind > 109)
+                     kind = 109;
                   jjCheckNAddStates(711, 713);
                   break;
                case 342:
@@ -2126,36 +2139,36 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 345:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 106)
-                     kind = 106;
+                  if (kind > 109)
+                     kind = 109;
                   jjstateSet[jjnewStateCnt++] = 346;
                   break;
                case 346:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 106)
-                     kind = 106;
+                  if (kind > 109)
+                     kind = 109;
                   jjCheckNAddStates(714, 717);
                   break;
                case 347:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 106)
-                     kind = 106;
+                  if (kind > 109)
+                     kind = 109;
                   jjCheckNAdd(321);
                   break;
                case 348:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 106)
-                     kind = 106;
+                  if (kind > 109)
+                     kind = 109;
                   jjCheckNAddTwoStates(321, 347);
                   break;
                case 349:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 106)
-                     kind = 106;
+                  if (kind > 109)
+                     kind = 109;
                   jjCheckNAddStates(718, 720);
                   break;
                case 350:
@@ -2181,43 +2194,43 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 356:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddStates(733, 736);
                   break;
                case 357:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddStates(737, 743);
                   break;
                case 358:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddStates(744, 746);
                   break;
                case 359:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddStates(747, 750);
                   break;
                case 360:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddStates(751, 755);
                   break;
                case 361:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddStates(756, 761);
                   break;
                case 362:
@@ -2243,15 +2256,15 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 368:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 68)
-                     kind = 68;
+                  if (kind > 71)
+                     kind = 71;
                   jjCheckNAddStates(0, 73);
                   break;
                case 369:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 68)
-                     kind = 68;
+                  if (kind > 71)
+                     kind = 71;
                   jjCheckNAdd(369);
                   break;
                case 370:
@@ -2480,8 +2493,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 4:
                   if ((0x7fffffe07fffffeL & l) != 0L)
                   {
-                     if (kind > 67)
-                        kind = 67;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(798, 803);
                   }
                   else if (curChar == 92)
@@ -2495,13 +2508,23 @@ private int jjMoveNfa_0(int startState, int curPos)
                   else if ((0x4000000040L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 33;
                   break;
+               case 79:
+                  if ((0x7fffffe07fffffeL & l) != 0L)
+                  {
+                     if (kind > 74)
+                        kind = 74;
+                     jjCheckNAddTwoStates(81, 82);
+                  }
+                  else if (curChar == 92)
+                     jjCheckNAddTwoStates(83, 93);
+                  break;
                case 42:
                   if ((0x7fffffe07fffffeL & l) != 0L)
                      jjCheckNAddStates(115, 118);
                   if ((0x7fffffe07fffffeL & l) != 0L)
                   {
-                     if (kind > 67)
-                        kind = 67;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddTwoStates(140, 141);
                   }
                   if ((0x200000002000L & l) != 0L)
@@ -2510,8 +2533,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 426:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 95)
-                        kind = 95;
+                     if (kind > 98)
+                        kind = 98;
                      jjCheckNAddTwoStates(113, 114);
                   }
                   else if (curChar == 92)
@@ -2524,8 +2547,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                      jjCheckNAddTwoStates(142, 143);
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 67)
-                        kind = 67;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddTwoStates(140, 141);
                   }
                   else if (curChar == 92)
@@ -2540,8 +2563,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 111:
                   if ((0x7fffffe07fffffeL & l) != 0L)
                   {
-                     if (kind > 95)
-                        kind = 95;
+                     if (kind > 98)
+                        kind = 98;
                      jjCheckNAddTwoStates(113, 114);
                   }
                   else if (curChar == 92)
@@ -2564,8 +2587,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                      jjCheckNAddStates(123, 125);
                   break;
                case 10:
-                  if (curChar == 125 && kind > 36)
-                     kind = 36;
+                  if (curChar == 125 && kind > 39)
+                     kind = 39;
                   break;
                case 11:
                   if (curChar == 92)
@@ -2628,8 +2651,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                      jjCheckNAddStates(189, 195);
                   break;
                case 29:
-                  if ((0x4000000040000L & l) != 0L && kind > 63)
-                     kind = 63;
+                  if ((0x4000000040000L & l) != 0L && kind > 66)
+                     kind = 66;
                   break;
                case 30:
                case 35:
@@ -2749,15 +2772,15 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 80:
                   if ((0x7fffffe07fffffeL & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 74)
+                     kind = 74;
                   jjCheckNAddTwoStates(81, 82);
                   break;
                case 81:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 74)
+                     kind = 74;
                   jjCheckNAddTwoStates(81, 82);
                   break;
                case 82:
@@ -2767,50 +2790,50 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 83:
                   if ((0x7fffffffffffffffL & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 74)
+                     kind = 74;
                   jjCheckNAddTwoStates(81, 82);
                   break;
                case 84:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 74)
+                     kind = 74;
                   jjCheckNAddStates(278, 281);
                   break;
                case 86:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 74)
+                     kind = 74;
                   jjCheckNAddStates(282, 288);
                   break;
                case 87:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 74)
+                     kind = 74;
                   jjCheckNAddStates(289, 291);
                   break;
                case 88:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 74)
+                     kind = 74;
                   jjCheckNAddStates(292, 295);
                   break;
                case 89:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 74)
+                     kind = 74;
                   jjCheckNAddStates(296, 300);
                   break;
                case 90:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 74)
+                     kind = 74;
                   jjCheckNAddStates(301, 306);
                   break;
                case 92:
@@ -2820,50 +2843,50 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 93:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 74)
+                     kind = 74;
                   jjCheckNAddStates(307, 310);
                   break;
                case 94:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 74)
+                     kind = 74;
                   jjCheckNAddStates(311, 317);
                   break;
                case 95:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 74)
+                     kind = 74;
                   jjCheckNAddStates(318, 320);
                   break;
                case 96:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 74)
+                     kind = 74;
                   jjCheckNAddStates(321, 324);
                   break;
                case 97:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 74)
+                     kind = 74;
                   jjCheckNAddStates(325, 329);
                   break;
                case 98:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 74)
+                     kind = 74;
                   jjCheckNAddStates(330, 335);
                   break;
                case 100:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 89)
-                     kind = 89;
+                  if (kind > 92)
+                     kind = 92;
                   jjCheckNAddTwoStates(100, 101);
                   break;
                case 101:
@@ -2873,50 +2896,50 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 102:
                   if ((0x7fffffffffffffffL & l) == 0L)
                      break;
-                  if (kind > 89)
-                     kind = 89;
+                  if (kind > 92)
+                     kind = 92;
                   jjCheckNAddTwoStates(100, 101);
                   break;
                case 103:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 89)
-                     kind = 89;
+                  if (kind > 92)
+                     kind = 92;
                   jjCheckNAddStates(336, 339);
                   break;
                case 105:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 89)
-                     kind = 89;
+                  if (kind > 92)
+                     kind = 92;
                   jjCheckNAddStates(340, 346);
                   break;
                case 106:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 89)
-                     kind = 89;
+                  if (kind > 92)
+                     kind = 92;
                   jjCheckNAddStates(347, 349);
                   break;
                case 107:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 89)
-                     kind = 89;
+                  if (kind > 92)
+                     kind = 92;
                   jjCheckNAddStates(350, 353);
                   break;
                case 108:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 89)
-                     kind = 89;
+                  if (kind > 92)
+                     kind = 92;
                   jjCheckNAddStates(354, 358);
                   break;
                case 109:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 89)
-                     kind = 89;
+                  if (kind > 92)
+                     kind = 92;
                   jjCheckNAddStates(359, 364);
                   break;
                case 110:
@@ -2926,15 +2949,15 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 112:
                   if ((0x7fffffe07fffffeL & l) == 0L)
                      break;
-                  if (kind > 95)
-                     kind = 95;
+                  if (kind > 98)
+                     kind = 98;
                   jjCheckNAddTwoStates(113, 114);
                   break;
                case 113:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 95)
-                     kind = 95;
+                  if (kind > 98)
+                     kind = 98;
                   jjCheckNAddTwoStates(113, 114);
                   break;
                case 114:
@@ -2944,50 +2967,50 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 115:
                   if ((0x7fffffffffffffffL & l) == 0L)
                      break;
-                  if (kind > 95)
-                     kind = 95;
+                  if (kind > 98)
+                     kind = 98;
                   jjCheckNAddTwoStates(113, 114);
                   break;
                case 116:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 95)
-                     kind = 95;
+                  if (kind > 98)
+                     kind = 98;
                   jjCheckNAddStates(365, 368);
                   break;
                case 118:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 95)
-                     kind = 95;
+                  if (kind > 98)
+                     kind = 98;
                   jjCheckNAddStates(369, 375);
                   break;
                case 119:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 95)
-                     kind = 95;
+                  if (kind > 98)
+                     kind = 98;
                   jjCheckNAddStates(376, 378);
                   break;
                case 120:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 95)
-                     kind = 95;
+                  if (kind > 98)
+                     kind = 98;
                   jjCheckNAddStates(379, 382);
                   break;
                case 121:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 95)
-                     kind = 95;
+                  if (kind > 98)
+                     kind = 98;
                   jjCheckNAddStates(383, 387);
                   break;
                case 122:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 95)
-                     kind = 95;
+                  if (kind > 98)
+                     kind = 98;
                   jjCheckNAddStates(388, 393);
                   break;
                case 124:
@@ -2997,43 +3020,43 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 125:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 95)
-                     kind = 95;
+                  if (kind > 98)
+                     kind = 98;
                   jjCheckNAddStates(394, 397);
                   break;
                case 126:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 95)
-                     kind = 95;
+                  if (kind > 98)
+                     kind = 98;
                   jjCheckNAddStates(398, 404);
                   break;
                case 127:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 95)
-                     kind = 95;
+                  if (kind > 98)
+                     kind = 98;
                   jjCheckNAddStates(405, 407);
                   break;
                case 128:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 95)
-                     kind = 95;
+                  if (kind > 98)
+                     kind = 98;
                   jjCheckNAddStates(408, 411);
                   break;
                case 129:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 95)
-                     kind = 95;
+                  if (kind > 98)
+                     kind = 98;
                   jjCheckNAddStates(412, 416);
                   break;
                case 130:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 95)
-                     kind = 95;
+                  if (kind > 98)
+                     kind = 98;
                   jjCheckNAddStates(417, 422);
                   break;
                case 131:
@@ -3063,8 +3086,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 140:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddTwoStates(140, 141);
                   break;
                case 141:
@@ -3074,50 +3097,50 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 142:
                   if ((0x7fffffffffffffffL & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddTwoStates(140, 141);
                   break;
                case 143:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddStates(425, 428);
                   break;
                case 145:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddStates(429, 435);
                   break;
                case 146:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddStates(436, 438);
                   break;
                case 147:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddStates(439, 442);
                   break;
                case 148:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddStates(443, 447);
                   break;
                case 149:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddStates(448, 453);
                   break;
                case 150:
@@ -3158,8 +3181,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                      jjCheckNAddStates(482, 488);
                   break;
                case 164:
-                  if ((0x10000000100000L & l) != 0L && kind > 65)
-                     kind = 65;
+                  if ((0x10000000100000L & l) != 0L && kind > 68)
+                     kind = 68;
                   break;
                case 165:
                   if ((0x100000001000L & l) != 0L)
@@ -3186,8 +3209,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                      jjstateSet[jjnewStateCnt++] = 169;
                   break;
                case 172:
-                  if ((0x10000000100000L & l) != 0L && kind > 96)
-                     kind = 96;
+                  if ((0x10000000100000L & l) != 0L && kind > 99)
+                     kind = 99;
                   break;
                case 173:
                   if ((0x400000004000L & l) != 0L)
@@ -3224,8 +3247,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 182:
                   if ((0x7fffffe07fffffeL & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddTwoStates(140, 141);
                   break;
                case 183:
@@ -3235,77 +3258,77 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 184:
                   if ((0x7fffffe07fffffeL & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddStates(798, 803);
                   break;
                case 190:
-                  if ((0x10000000100000L & l) != 0L && kind > 73)
-                     kind = 73;
+                  if ((0x10000000100000L & l) != 0L && kind > 76)
+                     kind = 76;
                   break;
                case 191:
                   if ((0x1000000010000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 190;
                   break;
                case 193:
-                  if ((0x200000002000L & l) != 0L && kind > 74)
-                     kind = 74;
+                  if ((0x200000002000L & l) != 0L && kind > 77)
+                     kind = 77;
                   break;
                case 194:
                   if ((0x200000002000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 193;
                   break;
                case 196:
-                  if ((0x200000002000L & l) != 0L && kind > 75)
-                     kind = 75;
+                  if ((0x200000002000L & l) != 0L && kind > 78)
+                     kind = 78;
                   break;
                case 197:
                   if ((0x800000008L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 196;
                   break;
                case 199:
-                  if ((0x800000008L & l) != 0L && kind > 76)
-                     kind = 76;
+                  if ((0x800000008L & l) != 0L && kind > 79)
+                     kind = 79;
                   break;
                case 200:
                   if ((0x1000000010000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 199;
                   break;
                case 202:
-                  if ((0x400000004000L & l) != 0L && kind > 77)
-                     kind = 77;
+                  if ((0x400000004000L & l) != 0L && kind > 80)
+                     kind = 80;
                   break;
                case 203:
                   if ((0x20000000200L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 202;
                   break;
                case 205:
-                  if ((0x100000001000000L & l) != 0L && kind > 78)
-                     kind = 78;
+                  if ((0x100000001000000L & l) != 0L && kind > 81)
+                     kind = 81;
                   break;
                case 206:
                   if ((0x1000000010000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 205;
                   break;
                case 208:
-                  if ((0x200000002000L & l) != 0L && kind > 79)
-                     kind = 79;
+                  if ((0x200000002000L & l) != 0L && kind > 82)
+                     kind = 82;
                   break;
                case 209:
                   if ((0x2000000020L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 208;
                   break;
                case 211:
-                  if ((0x100000001000000L & l) != 0L && kind > 80)
-                     kind = 80;
+                  if ((0x100000001000000L & l) != 0L && kind > 83)
+                     kind = 83;
                   break;
                case 212:
                   if ((0x2000000020L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 211;
                   break;
                case 214:
-                  if ((0x8000000080L & l) != 0L && kind > 81)
-                     kind = 81;
+                  if ((0x8000000080L & l) != 0L && kind > 84)
+                     kind = 84;
                   break;
                case 215:
                   if ((0x2000000020L & l) != 0L)
@@ -3316,8 +3339,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                      jjstateSet[jjnewStateCnt++] = 215;
                   break;
                case 218:
-                  if ((0x1000000010L & l) != 0L && kind > 82)
-                     kind = 82;
+                  if ((0x1000000010L & l) != 0L && kind > 85)
+                     kind = 85;
                   break;
                case 219:
                   if ((0x200000002L & l) != 0L)
@@ -3328,8 +3351,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                      jjstateSet[jjnewStateCnt++] = 219;
                   break;
                case 222:
-                  if ((0x1000000010L & l) != 0L && kind > 83)
-                     kind = 83;
+                  if ((0x1000000010L & l) != 0L && kind > 86)
+                     kind = 86;
                   break;
                case 223:
                   if ((0x200000002L & l) != 0L)
@@ -3344,28 +3367,28 @@ private int jjMoveNfa_0(int startState, int curPos)
                      jjstateSet[jjnewStateCnt++] = 224;
                   break;
                case 227:
-                  if ((0x8000000080000L & l) != 0L && kind > 84)
-                     kind = 84;
+                  if ((0x8000000080000L & l) != 0L && kind > 87)
+                     kind = 87;
                   break;
                case 228:
                   if ((0x200000002000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 227;
                   break;
                case 230:
-                  if ((0x8000000080000L & l) != 0L && kind > 85)
-                     kind = 85;
+                  if ((0x8000000080000L & l) != 0L && kind > 88)
+                     kind = 88;
                   break;
                case 232:
-                  if ((0x400000004000000L & l) != 0L && kind > 86)
-                     kind = 86;
+                  if ((0x400000004000000L & l) != 0L && kind > 89)
+                     kind = 89;
                   break;
                case 233:
                   if ((0x10000000100L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 232;
                   break;
                case 235:
-                  if ((0x400000004000000L & l) != 0L && kind > 87)
-                     kind = 87;
+                  if ((0x400000004000000L & l) != 0L && kind > 90)
+                     kind = 90;
                   break;
                case 236:
                   if ((0x10000000100L & l) != 0L)
@@ -3378,15 +3401,15 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 240:
                   if ((0x7fffffe07fffffeL & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 91)
+                     kind = 91;
                   jjCheckNAddTwoStates(241, 242);
                   break;
                case 241:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 91)
+                     kind = 91;
                   jjCheckNAddTwoStates(241, 242);
                   break;
                case 242:
@@ -3396,50 +3419,50 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 243:
                   if ((0x7fffffffffffffffL & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 91)
+                     kind = 91;
                   jjCheckNAddTwoStates(241, 242);
                   break;
                case 244:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 91)
+                     kind = 91;
                   jjCheckNAddStates(489, 492);
                   break;
                case 246:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 91)
+                     kind = 91;
                   jjCheckNAddStates(493, 499);
                   break;
                case 247:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 91)
+                     kind = 91;
                   jjCheckNAddStates(500, 502);
                   break;
                case 248:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 91)
+                     kind = 91;
                   jjCheckNAddStates(503, 506);
                   break;
                case 249:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 91)
+                     kind = 91;
                   jjCheckNAddStates(507, 511);
                   break;
                case 250:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 91)
+                     kind = 91;
                   jjCheckNAddStates(512, 517);
                   break;
                case 252:
@@ -3449,43 +3472,43 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 253:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 91)
+                     kind = 91;
                   jjCheckNAddStates(518, 521);
                   break;
                case 254:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 91)
+                     kind = 91;
                   jjCheckNAddStates(522, 528);
                   break;
                case 255:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 91)
+                     kind = 91;
                   jjCheckNAddStates(529, 531);
                   break;
                case 256:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 91)
+                     kind = 91;
                   jjCheckNAddStates(532, 535);
                   break;
                case 257:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 91)
+                     kind = 91;
                   jjCheckNAddStates(536, 540);
                   break;
                case 258:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 91)
+                     kind = 91;
                   jjCheckNAddStates(541, 546);
                   break;
                case 259:
@@ -3610,8 +3633,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 317:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 106)
-                     kind = 106;
+                  if (kind > 109)
+                     kind = 109;
                   jjAddStates(698, 703);
                   break;
                case 318:
@@ -3627,8 +3650,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                      jjCheckNAdd(321);
                   break;
                case 321:
-                  if ((0x7e0000007eL & l) != 0L && kind > 106)
-                     kind = 106;
+                  if ((0x7e0000007eL & l) != 0L && kind > 109)
+                     kind = 109;
                   break;
                case 322:
                   if ((0x7e0000007eL & l) != 0L)
@@ -3645,8 +3668,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 325:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 106)
-                     kind = 106;
+                  if (kind > 109)
+                     kind = 109;
                   jjstateSet[jjnewStateCnt++] = 313;
                   break;
                case 326:
@@ -3660,8 +3683,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 328:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 106)
-                     kind = 106;
+                  if (kind > 109)
+                     kind = 109;
                   jjstateSet[jjnewStateCnt++] = 329;
                   break;
                case 330:
@@ -3671,15 +3694,15 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 331:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 106)
-                     kind = 106;
+                  if (kind > 109)
+                     kind = 109;
                   jjstateSet[jjnewStateCnt++] = 332;
                   break;
                case 334:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 106)
-                     kind = 106;
+                  if (kind > 109)
+                     kind = 109;
                   jjstateSet[jjnewStateCnt++] = 335;
                   break;
                case 343:
@@ -3689,36 +3712,36 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 345:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 106)
-                     kind = 106;
+                  if (kind > 109)
+                     kind = 109;
                   jjstateSet[jjnewStateCnt++] = 346;
                   break;
                case 346:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 106)
-                     kind = 106;
+                  if (kind > 109)
+                     kind = 109;
                   jjCheckNAddStates(714, 717);
                   break;
                case 347:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 106)
-                     kind = 106;
+                  if (kind > 109)
+                     kind = 109;
                   jjCheckNAdd(321);
                   break;
                case 348:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 106)
-                     kind = 106;
+                  if (kind > 109)
+                     kind = 109;
                   jjCheckNAddTwoStates(321, 347);
                   break;
                case 349:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 106)
-                     kind = 106;
+                  if (kind > 109)
+                     kind = 109;
                   jjCheckNAddStates(718, 720);
                   break;
                case 350:
@@ -3748,43 +3771,43 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 356:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddStates(733, 736);
                   break;
                case 357:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddStates(737, 743);
                   break;
                case 358:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddStates(744, 746);
                   break;
                case 359:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddStates(747, 750);
                   break;
                case 360:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddStates(751, 755);
                   break;
                case 361:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddStates(756, 761);
                   break;
                case 362:
@@ -3822,24 +3845,33 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 4:
                   if ((jjbitVec0[i2] & l2) == 0L)
                      break;
-                  if (kind > 37)
-                     kind = 37;
+                  if (kind > 40)
+                     kind = 40;
                   jjCheckNAddStates(798, 803);
                   break;
+               case 79:
+               case 81:
+               case 83:
+                  if ((jjbitVec0[i2] & l2) == 0L)
+                     break;
+                  if (kind > 74)
+                     kind = 74;
+                  jjCheckNAddTwoStates(81, 82);
+                  break;
                case 426:
                case 113:
                case 115:
                   if ((jjbitVec0[i2] & l2) == 0L)
                      break;
-                  if (kind > 95)
-                     kind = 95;
+                  if (kind > 98)
+                     kind = 98;
                   jjCheckNAddTwoStates(113, 114);
                   break;
                case 425:
                   if ((jjbitVec0[i2] & l2) != 0L)
                   {
-                     if (kind > 67)
-                        kind = 67;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddTwoStates(140, 141);
                   }
                   if ((jjbitVec0[i2] & l2) != 0L)
@@ -3848,8 +3880,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 111:
                   if ((jjbitVec0[i2] & l2) == 0L)
                      break;
-                  if (kind > 95)
-                     kind = 95;
+                  if (kind > 98)
+                     kind = 98;
                   jjCheckNAddTwoStates(113, 114);
                   break;
                case 2:
@@ -3872,29 +3904,20 @@ private int jjMoveNfa_0(int startState, int curPos)
                   if ((jjbitVec0[i2] & l2) != 0L)
                      jjCheckNAddStates(102, 105);
                   break;
-               case 81:
-               case 83:
-               case 91:
-                  if ((jjbitVec0[i2] & l2) == 0L)
-                     break;
-                  if (kind > 71)
-                     kind = 71;
-                  jjCheckNAddTwoStates(81, 82);
-                  break;
                case 100:
                case 102:
                   if ((jjbitVec0[i2] & l2) == 0L)
                      break;
-                  if (kind > 89)
-                     kind = 89;
+                  if (kind > 92)
+                     kind = 92;
                   jjCheckNAddTwoStates(100, 101);
                   break;
                case 140:
                case 142:
                   if ((jjbitVec0[i2] & l2) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddTwoStates(140, 141);
                   break;
                case 150:
@@ -3907,8 +3930,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 251:
                   if ((jjbitVec0[i2] & l2) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 91)
+                     kind = 91;
                   jjCheckNAddTwoStates(241, 242);
                   break;
                case 261:
@@ -4151,14 +4174,14 @@ static final int[] jjnextStates = {
 /** Token literal values. */
 public static final String[] jjstrLiteralImages = {
 "", null, null, null, null, null, null, null, null, null, "\74\41\55\55", 
-"\55\55\76", "\173", "\175", "\174\75", "\176\75", "\75", "\53", "\55", "\54", "\73", 
-"\76", "\74", "\57", "\133", "\135", "\52", "\46", "\56", "\50", "\51", "\75\75", 
-"\174\174", "\46\46", "\41\75", "\72", null, null, null, null, null, null, null, null, 
+"\55\55\76", "\173", "\175", "\174\75", "\136\75", "\44\75", "\52\75", "\176\75", "\75", 
+"\53", "\55", "\54", "\73", "\76", "\74", "\57", "\133", "\135", "\52", "\46", "\56", 
+"\50", "\51", "\75\75", "\174\174", "\46\46", "\41\75", "\72", null, null, null, null, 
 null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
 null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
 null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
 null, null, null, null, null, null, null, null, null, null, null, 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, };
 
 /** Lexer state names. */
 public static final String[] lexStateNames = {
@@ -4174,10 +4197,10 @@ public static final int[] jjnewLexState = {
    -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 = {
-   0xffffc03ffffffc03L, 0x3c01ffffffdfL, 
+   0xfffe01fffffffc03L, 0x1e00ffffffeffL, 
 };
 static final long[] jjtoSkip = {
    0x190L, 0x0L, 
@@ -4303,9 +4326,9 @@ public Token getNextToken()
          jjmatchedKind = 0x7fffffff;
          jjmatchedPos = 0;
          curPos = jjMoveStringLiteralDfa0_0();
-         if (jjmatchedPos == 0 && jjmatchedKind > 109)
+         if (jjmatchedPos == 0 && jjmatchedKind > 112)
          {
-            jjmatchedKind = 109;
+            jjmatchedKind = 112;
          }
          break;
        case 1:
index 50c5fb7cc5321420c9282144a8e5df89a30b6d37..40302ce6d3f4522f9914a435e05a7c4f6833a7ac 100644 (file)
@@ -100,4 +100,8 @@ p::abc {
 
 p:first {
        color: red;
+}
+
+.foo a[class^=icon-] {
+       color: red;
 }
\ No newline at end of file