cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From johnth...@apache.org
Subject [2/5] cayenne git commit: CAY-2499 Support for COUNT(DISTINCT(column)) function aggregate
Date Wed, 12 Dec 2018 20:49:22 GMT
http://git-wip-us.apache.org/repos/asf/cayenne/blob/54b3f811/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ExpressionParserTokenManager.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ExpressionParserTokenManager.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ExpressionParserTokenManager.java
index e1d31ad..ca71544 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ExpressionParserTokenManager.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ExpressionParserTokenManager.java
@@ -108,201 +108,203 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
    switch (pos)
    {
       case 0:
-         if ((active0 & 0x18030000000000L) != 0L)
+         if ((active0 & 0x30050000000000L) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 70;
             return 36;
          }
-         if ((active0 & 0x80000000000L) != 0L)
-         {
-            jjmatchedKind = 69;
-            return 6;
-         }
          if ((active0 & 0x8L) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 70;
             return 63;
          }
-         if ((active0 & 0xffc7f4f00004e006L) != 0L || (active1 & 0xeL) != 0L)
+         if ((active0 & 0x100000000000L) != 0L)
+         {
+            jjmatchedKind = 70;
+            return 6;
+         }
+         if ((active0 & 0xff8feaf00004e006L) != 0L || (active1 & 0x1dL) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 70;
             return 74;
          }
          return -1;
       case 1:
-         if ((active0 & 0x18000000000000L) != 0L)
-         {
-            jjmatchedKind = 69;
-            jjmatchedPos = 1;
-            return 35;
-         }
          if ((active0 & 0x8002L) != 0L)
             return 74;
-         if ((active0 & 0x80000000000L) != 0L)
+         if ((active0 & 0x100000000000L) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 70;
             jjmatchedPos = 1;
             return 5;
          }
          if ((active0 & 0x8L) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 70;
             jjmatchedPos = 1;
             return 64;
          }
-         if ((active0 & 0xffc7f7f000046004L) != 0L || (active1 & 0xeL) != 0L)
+         if ((active0 & 0x30000000000000L) != 0L)
+         {
+            jjmatchedKind = 70;
+            jjmatchedPos = 1;
+            return 35;
+         }
+         if ((active0 & 0xff8feff000046004L) != 0L || (active1 & 0x1dL) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 70;
             jjmatchedPos = 1;
             return 74;
          }
          return -1;
       case 2:
-         if ((active0 & 0x5e0500f00000000cL) != 0L)
+         if ((active0 & 0xbc0a00f00000000cL) != 0L)
             return 74;
-         if ((active0 & 0xa1c2ff0000046000L) != 0L || (active1 & 0xaL) != 0L)
+         if ((active0 & 0x30000000000000L) != 0L)
          {
             if (jjmatchedPos != 2)
             {
-               jjmatchedKind = 69;
+               jjmatchedKind = 70;
                jjmatchedPos = 2;
             }
-            return 74;
+            return 34;
          }
-         if ((active0 & 0x18000000000000L) != 0L)
+         if ((active0 & 0x4385ff0000046000L) != 0L || (active1 & 0x15L) != 0L)
          {
             if (jjmatchedPos != 2)
             {
-               jjmatchedKind = 69;
+               jjmatchedKind = 70;
                jjmatchedPos = 2;
             }
-            return 34;
+            return 74;
          }
          return -1;
       case 3:
-         if ((active0 & 0x2142080000006000L) != 0L)
+         if ((active0 & 0x4284100000006000L) != 0L)
             return 74;
-         if ((active0 & 0x18000000000000L) != 0L)
+         if ((active0 & 0x30000000000000L) != 0L)
          {
             if (jjmatchedPos != 3)
             {
-               jjmatchedKind = 69;
+               jjmatchedKind = 70;
                jjmatchedPos = 3;
             }
             return 33;
          }
-         if ((active0 & 0xda80f70000040000L) != 0L || (active1 & 0x8L) != 0L)
+         if ((active0 & 0xb501ef0000040000L) != 0L || (active1 & 0x11L) != 0L)
          {
             if (jjmatchedPos != 3)
             {
-               jjmatchedKind = 69;
+               jjmatchedKind = 70;
                jjmatchedPos = 3;
             }
             return 74;
          }
          return -1;
       case 4:
-         if ((active0 & 0x80310000000000L) != 0L)
+         if ((active0 & 0x100610000000000L) != 0L)
             return 74;
-         if ((active0 & 0x18000000000000L) != 0L)
+         if ((active0 & 0x30000000000000L) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 70;
             jjmatchedPos = 4;
             return 32;
          }
-         if ((active0 & 0xda00c60000044000L) != 0L)
+         if ((active0 & 0xb4018e0000044000L) != 0L || (active1 & 0x1L) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 70;
             jjmatchedPos = 4;
             return 74;
          }
          return -1;
       case 5:
-         if ((active0 & 0x18000000000000L) != 0L)
+         if ((active0 & 0x30000000000000L) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 70;
             jjmatchedPos = 5;
             return 31;
          }
-         if ((active0 & 0xc000c20000000000L) != 0L)
+         if ((active0 & 0x8001840000000000L) != 0L || (active1 & 0x1L) != 0L)
             return 74;
-         if ((active0 & 0x1a00040000044000L) != 0L)
+         if ((active0 & 0x34000a0000044000L) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 70;
             jjmatchedPos = 5;
             return 74;
          }
          return -1;
       case 6:
-         if ((active0 & 0x18000000000000L) != 0L)
+         if ((active0 & 0x30000000000000L) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 70;
             jjmatchedPos = 6;
             return 30;
          }
          if ((active0 & 0x40000L) != 0L)
             return 74;
-         if ((active0 & 0x1a00040000004000L) != 0L)
+         if ((active0 & 0x34000a0000004000L) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 70;
             jjmatchedPos = 6;
             return 74;
          }
          return -1;
       case 7:
-         if ((active0 & 0x1a08040000004000L) != 0L)
+         if ((active0 & 0x20000000000L) != 0L)
+            return 74;
+         if ((active0 & 0x20000000000000L) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 70;
             jjmatchedPos = 7;
-            return 74;
+            return 29;
          }
-         if ((active0 & 0x10000000000000L) != 0L)
+         if ((active0 & 0x3410080000004000L) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 70;
             jjmatchedPos = 7;
-            return 29;
+            return 74;
          }
          return -1;
       case 8:
-         if ((active0 & 0x1200040000000000L) != 0L)
-            return 74;
-         if ((active0 & 0x10000000000000L) != 0L)
+         if ((active0 & 0x20000000000000L) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 70;
             jjmatchedPos = 8;
             return 28;
          }
-         if ((active0 & 0x808000000004000L) != 0L)
+         if ((active0 & 0x2400080000000000L) != 0L)
+            return 74;
+         if ((active0 & 0x1010000000004000L) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 70;
             jjmatchedPos = 8;
             return 74;
          }
          return -1;
       case 9:
-         if ((active0 & 0x800000000000000L) != 0L)
+         if ((active0 & 0x1000000000000000L) != 0L)
             return 74;
-         if ((active0 & 0x10000000000000L) != 0L)
+         if ((active0 & 0x20000000000000L) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 70;
             jjmatchedPos = 9;
             return 27;
          }
-         if ((active0 & 0x8000000004000L) != 0L)
+         if ((active0 & 0x10000000004000L) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 70;
             jjmatchedPos = 9;
             return 74;
          }
          return -1;
       case 10:
-         if ((active0 & 0x10000000000000L) != 0L)
+         if ((active0 & 0x20000000000000L) != 0L)
             return 26;
-         if ((active0 & 0x8000000000000L) != 0L)
+         if ((active0 & 0x10000000000000L) != 0L)
             return 74;
          if ((active0 & 0x4000L) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 70;
             jjmatchedPos = 10;
             return 74;
          }
@@ -310,7 +312,7 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
       case 11:
          if ((active0 & 0x4000L) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 70;
             jjmatchedPos = 11;
             return 74;
          }
@@ -318,7 +320,7 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
       case 12:
          if ((active0 & 0x4000L) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 70;
             jjmatchedPos = 12;
             return 74;
          }
@@ -345,19 +347,19 @@ private int jjMoveStringLiteralDfa0_0()
          jjmatchedKind = 4;
          return jjMoveStringLiteralDfa1_0(0x80L, 0x0L);
       case 34:
-         return jjStopAtPos(0, 74);
+         return jjStopAtPos(0, 75);
       case 36:
-         return jjStopAtPos(0, 64);
+         return jjStopAtPos(0, 65);
       case 38:
          return jjStopAtPos(0, 22);
       case 39:
-         return jjStopAtPos(0, 73);
+         return jjStopAtPos(0, 74);
       case 40:
          return jjStopAtPos(0, 16);
       case 41:
          return jjStopAtPos(0, 17);
       case 42:
-         return jjStopAtPos(0, 68);
+         return jjStopAtPos(0, 69);
       case 43:
          return jjStopAtPos(0, 25);
       case 44:
@@ -378,37 +380,37 @@ private int jjMoveStringLiteralDfa0_0()
       case 94:
          return jjStopAtPos(0, 21);
       case 97:
-         return jjMoveStringLiteralDfa1_0(0x1001000000004L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x2001000000004L, 0x0L);
       case 98:
          return jjMoveStringLiteralDfa1_0(0x40000L, 0x0L);
       case 99:
-         return jjMoveStringLiteralDfa1_0(0x18030000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x30050000000000L, 0x0L);
       case 100:
-         return jjMoveStringLiteralDfa1_0(0x1e00000000000000L, 0x4L);
+         return jjMoveStringLiteralDfa1_0(0x3c00020000000000L, 0x8L);
       case 101:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x8L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x10L);
       case 104:
-         return jjMoveStringLiteralDfa1_0(0x2000000000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x4000000000000000L, 0x0L);
       case 105:
          return jjMoveStringLiteralDfa1_0(0x8000L, 0x0L);
       case 108:
-         return jjMoveStringLiteralDfa1_0(0xd00000006000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x1a00000006000L, 0x0L);
       case 109:
-         return jjMoveStringLiteralDfa1_0(0x4084006000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x8108006000000000L, 0x0L);
       case 110:
          return jjMoveStringLiteralDfa1_0(0x8L, 0x0L);
       case 111:
-         return jjMoveStringLiteralDfa1_0(0x2L, 0x2L);
+         return jjMoveStringLiteralDfa1_0(0x2L, 0x4L);
       case 115:
-         return jjMoveStringLiteralDfa1_0(0x8002048000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x4088000000000L, 0x1L);
       case 116:
-         return jjMoveStringLiteralDfa1_0(0x80000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x100000000000L, 0x0L);
       case 117:
-         return jjMoveStringLiteralDfa1_0(0x200000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x400000000000L, 0x0L);
       case 119:
-         return jjMoveStringLiteralDfa1_0(0x100000000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x200000000000000L, 0x0L);
       case 121:
-         return jjMoveStringLiteralDfa1_0(0x40000000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x80000000000000L, 0x0L);
       case 124:
          return jjStopAtPos(0, 20);
       case 126:
@@ -447,29 +449,29 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1)
             return jjStopAtPos(1, 24);
          break;
       case 97:
-         return jjMoveStringLiteralDfa2_0(active0, 0x1e00004000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x3c00004000000000L, active1, 0L);
       case 98:
-         return jjMoveStringLiteralDfa2_0(active0, 0x1000000000000L, active1, 0x6L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x2000000000000L, active1, 0xcL);
       case 101:
-         return jjMoveStringLiteralDfa2_0(active0, 0x8140400000040000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x280800000040000L, active1, 0x1L);
       case 105:
-         return jjMoveStringLiteralDfa2_0(active0, 0x4000002000006000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x8000022000006000L, active1, 0L);
       case 110:
          if ((active0 & 0x8000L) != 0L)
             return jjStartNfaWithStates_0(1, 15, 74);
-         return jjMoveStringLiteralDfa2_0(active0, 0x4L, active1, 0x8L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x4L, active1, 0x10L);
       case 111:
-         return jjMoveStringLiteralDfa2_0(active0, 0x2084930000000008L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x4109250000000008L, active1, 0L);
       case 112:
-         return jjMoveStringLiteralDfa2_0(active0, 0x200000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x400000000000L, active1, 0L);
       case 113:
-         return jjMoveStringLiteralDfa2_0(active0, 0x2000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x4000000000000L, active1, 0L);
       case 114:
          if ((active0 & 0x2L) != 0L)
             return jjStartNfaWithStates_0(1, 1, 74);
-         return jjMoveStringLiteralDfa2_0(active0, 0x80000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x100000000000L, active1, 0L);
       case 117:
-         return jjMoveStringLiteralDfa2_0(active0, 0x18048000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x30088000000000L, active1, 0L);
       case 118:
          return jjMoveStringLiteralDfa2_0(active0, 0x1000000000L, active1, 0L);
       default :
@@ -489,31 +491,31 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
    switch(curChar)
    {
       case 58:
-         if ((active1 & 0x4L) != 0L)
-            return jjStopAtPos(2, 66);
+         if ((active1 & 0x8L) != 0L)
+            return jjStopAtPos(2, 67);
          break;
       case 97:
-         return jjMoveStringLiteralDfa3_0(active0, 0x40000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x80000000000000L, active1, 0L);
       case 98:
-         return jjMoveStringLiteralDfa3_0(active0, 0x40000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x80000000000L, active1, 0L);
       case 99:
-         return jjMoveStringLiteralDfa3_0(active0, 0x8000800000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1000000000000L, active1, 0x1L);
       case 100:
          if ((active0 & 0x4L) != 0L)
             return jjStartNfaWithStates_0(2, 2, 74);
-         else if ((active0 & 0x4000000000000L) != 0L)
-            return jjStartNfaWithStates_0(2, 50, 74);
+         else if ((active0 & 0x8000000000000L) != 0L)
+            return jjStartNfaWithStates_0(2, 51, 74);
          break;
       case 101:
-         return jjMoveStringLiteralDfa3_0(active0, 0x100000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x200000000000000L, active1, 0L);
       case 103:
          if ((active0 & 0x1000000000L) != 0L)
             return jjStartNfaWithStates_0(2, 36, 74);
          break;
       case 105:
-         return jjMoveStringLiteralDfa3_0(active0, 0x80000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x100000000000L, active1, 0L);
       case 106:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x2L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x4L);
       case 107:
          return jjMoveStringLiteralDfa3_0(active0, 0x6000L, active1, 0L);
       case 109:
@@ -526,34 +528,34 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
             jjmatchedKind = 37;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x4080420000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x8100840000000000L, active1, 0L);
       case 112:
-         return jjMoveStringLiteralDfa3_0(active0, 0x200000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x400000000000L, active1, 0L);
       case 114:
-         return jjMoveStringLiteralDfa3_0(active0, 0x1a000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x34000000000000L, active1, 0L);
       case 115:
-         if ((active0 & 0x1000000000000L) != 0L)
-            return jjStartNfaWithStates_0(2, 48, 74);
-         break;
+         if ((active0 & 0x2000000000000L) != 0L)
+            return jjStartNfaWithStates_0(2, 49, 74);
+         return jjMoveStringLiteralDfa3_0(active0, 0x20000000000L, active1, 0L);
       case 116:
          if ((active0 & 0x8L) != 0L)
             return jjStartNfaWithStates_0(2, 3, 74);
          return jjMoveStringLiteralDfa3_0(active0, 0x40000L, active1, 0L);
       case 117:
-         return jjMoveStringLiteralDfa3_0(active0, 0x2000010000000000L, active1, 0x8L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4000010000000000L, active1, 0x10L);
       case 119:
-         return jjMoveStringLiteralDfa3_0(active0, 0x100000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x200000000000L, active1, 0L);
       case 120:
          if ((active0 & 0x4000000000L) != 0L)
             return jjStartNfaWithStates_0(2, 38, 74);
          break;
       case 121:
-         if ((active0 & 0x400000000000000L) != 0L)
+         if ((active0 & 0x800000000000000L) != 0L)
          {
-            jjmatchedKind = 58;
+            jjmatchedKind = 59;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x1a00000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x3400000000000000L, active1, 0L);
       default :
          break;
    }
@@ -571,50 +573,50 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long a
    switch(curChar)
    {
       case 58:
-         if ((active1 & 0x2L) != 0L)
-            return jjStopAtPos(3, 65);
+         if ((active1 & 0x4L) != 0L)
+            return jjStopAtPos(3, 66);
          break;
       case 79:
-         return jjMoveStringLiteralDfa4_0(active0, 0x1a00000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x3400000000000000L, active1, 0L);
       case 97:
-         return jjMoveStringLiteralDfa4_0(active0, 0x800000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x1000000000000L, active1, 0L);
       case 99:
-         return jjMoveStringLiteralDfa4_0(active0, 0x20000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x40000000000L, active1, 0L);
       case 101:
          if ((active0 & 0x2000L) != 0L)
          {
             jjmatchedKind = 13;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x300000004000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x600000004000L, active1, 0L);
       case 103:
-         return jjMoveStringLiteralDfa4_0(active0, 0x400000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x800000000000L, active1, 0L);
       case 107:
-         if ((active0 & 0x100000000000000L) != 0L)
-            return jjStartNfaWithStates_0(3, 56, 74);
+         if ((active0 & 0x200000000000000L) != 0L)
+            return jjStartNfaWithStates_0(3, 57, 74);
          break;
       case 109:
-         if ((active0 & 0x80000000000L) != 0L)
-            return jjStartNfaWithStates_0(3, 43, 74);
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x8L);
+         if ((active0 & 0x100000000000L) != 0L)
+            return jjStartNfaWithStates_0(3, 44, 74);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x10L);
       case 110:
          return jjMoveStringLiteralDfa4_0(active0, 0x10000000000L, active1, 0L);
       case 111:
-         return jjMoveStringLiteralDfa4_0(active0, 0x8000000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x1L);
       case 114:
-         if ((active0 & 0x40000000000000L) != 0L)
-            return jjStartNfaWithStates_0(3, 54, 74);
-         else if ((active0 & 0x2000000000000000L) != 0L)
-            return jjStartNfaWithStates_0(3, 61, 74);
-         return jjMoveStringLiteralDfa4_0(active0, 0x18000000000000L, active1, 0L);
+         if ((active0 & 0x80000000000000L) != 0L)
+            return jjStartNfaWithStates_0(3, 55, 74);
+         else if ((active0 & 0x4000000000000000L) != 0L)
+            return jjStartNfaWithStates_0(3, 62, 74);
+         return jjMoveStringLiteralDfa4_0(active0, 0x30000000000000L, active1, 0L);
       case 115:
-         return jjMoveStringLiteralDfa4_0(active0, 0x40000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x80000000000L, active1, 0L);
       case 116:
-         if ((active0 & 0x2000000000000L) != 0L)
-            return jjStartNfaWithStates_0(3, 49, 74);
-         return jjMoveStringLiteralDfa4_0(active0, 0x80000000000000L, active1, 0L);
+         if ((active0 & 0x4000000000000L) != 0L)
+            return jjStartNfaWithStates_0(3, 50, 74);
+         return jjMoveStringLiteralDfa4_0(active0, 0x100020000000000L, active1, 0L);
       case 117:
-         return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x8000000000000000L, active1, 0L);
       case 119:
          return jjMoveStringLiteralDfa4_0(active0, 0x40000L, active1, 0L);
       default :
@@ -634,33 +636,35 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
    switch(curChar)
    {
       case 58:
-         if ((active1 & 0x8L) != 0L)
-            return jjStopAtPos(4, 67);
+         if ((active1 & 0x10L) != 0L)
+            return jjStopAtPos(4, 68);
          break;
       case 73:
          return jjMoveStringLiteralDfa5_0(active0, 0x4000L, active1, 0L);
       case 97:
-         return jjMoveStringLiteralDfa5_0(active0, 0x20000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x40000000000L, active1, 0L);
       case 101:
-         return jjMoveStringLiteralDfa5_0(active0, 0x18000000040000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x30000000040000L, active1, 0L);
       case 102:
-         return jjMoveStringLiteralDfa5_0(active0, 0x1a00000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x3400000000000000L, active1, 0L);
       case 104:
-         if ((active0 & 0x80000000000000L) != 0L)
-            return jjStartNfaWithStates_0(4, 55, 74);
+         if ((active0 & 0x100000000000000L) != 0L)
+            return jjStartNfaWithStates_0(4, 56, 74);
          break;
+      case 105:
+         return jjMoveStringLiteralDfa5_0(active0, 0x20000000000L, active1, 0L);
       case 110:
-         return jjMoveStringLiteralDfa5_0(active0, 0x8000000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x1L);
       case 114:
-         if ((active0 & 0x100000000000L) != 0L)
-            return jjStartNfaWithStates_0(4, 44, 74);
-         else if ((active0 & 0x200000000000L) != 0L)
+         if ((active0 & 0x200000000000L) != 0L)
             return jjStartNfaWithStates_0(4, 45, 74);
+         else if ((active0 & 0x400000000000L) != 0L)
+            return jjStartNfaWithStates_0(4, 46, 74);
          break;
       case 116:
          if ((active0 & 0x10000000000L) != 0L)
             return jjStartNfaWithStates_0(4, 40, 74);
-         return jjMoveStringLiteralDfa5_0(active0, 0x4000c40000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x8001880000000000L, active1, 0L);
       default :
          break;
    }
@@ -672,50 +676,50 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
       return jjStartNfa_0(3, old0, old1);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_0(4, active0, 0L);
+      jjStopStringLiteralDfa_0(4, active0, active1);
       return 5;
    }
    switch(curChar)
    {
       case 77:
-         return jjMoveStringLiteralDfa6_0(active0, 0x800000000000000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x1000000000000000L, active1, 0L);
       case 87:
-         return jjMoveStringLiteralDfa6_0(active0, 0x1000000000000000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x2000000000000000L, active1, 0L);
       case 89:
-         return jjMoveStringLiteralDfa6_0(active0, 0x200000000000000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x400000000000000L, active1, 0L);
       case 100:
-         if ((active0 & 0x8000000000000000L) != 0L)
-            return jjStartNfaWithStates_0(5, 63, 74);
+         if ((active1 & 0x1L) != 0L)
+            return jjStartNfaWithStates_0(5, 64, 74);
          break;
       case 101:
-         if ((active0 & 0x800000000000L) != 0L)
-            return jjStartNfaWithStates_0(5, 47, 74);
-         else if ((active0 & 0x4000000000000000L) != 0L)
-            return jjStartNfaWithStates_0(5, 62, 74);
-         return jjMoveStringLiteralDfa6_0(active0, 0x40000L);
+         if ((active0 & 0x1000000000000L) != 0L)
+            return jjStartNfaWithStates_0(5, 48, 74);
+         else if ((active0 & 0x8000000000000000L) != 0L)
+            return jjStartNfaWithStates_0(5, 63, 74);
+         return jjMoveStringLiteralDfa6_0(active0, 0x40000L, active1, 0L);
       case 103:
-         return jjMoveStringLiteralDfa6_0(active0, 0x4000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x4000L, active1, 0L);
       case 104:
-         if ((active0 & 0x400000000000L) != 0L)
-            return jjStartNfaWithStates_0(5, 46, 74);
+         if ((active0 & 0x800000000000L) != 0L)
+            return jjStartNfaWithStates_0(5, 47, 74);
          break;
       case 110:
-         return jjMoveStringLiteralDfa6_0(active0, 0x18000000000000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x30020000000000L, active1, 0L);
       case 114:
-         return jjMoveStringLiteralDfa6_0(active0, 0x40000000000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x80000000000L, active1, 0L);
       case 116:
-         if ((active0 & 0x20000000000L) != 0L)
-            return jjStartNfaWithStates_0(5, 41, 74);
+         if ((active0 & 0x40000000000L) != 0L)
+            return jjStartNfaWithStates_0(5, 42, 74);
          break;
       default :
          break;
    }
-   return jjStartNfa_0(4, active0, 0L);
+   return jjStartNfa_0(4, active0, active1);
 }
-private int jjMoveStringLiteralDfa6_0(long old0, long active0)
+private int jjMoveStringLiteralDfa6_0(long old0, long active0, long old1, long active1)
 {
-   if (((active0 &= old0)) == 0L)
-      return jjStartNfa_0(4, old0, 0L);
+   if (((active0 &= old0) | (active1 &= old1)) == 0L)
+      return jjStartNfa_0(4, old0, old1);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
       jjStopStringLiteralDfa_0(5, active0, 0L);
@@ -723,18 +727,20 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0)
    }
    switch(curChar)
    {
+      case 99:
+         return jjMoveStringLiteralDfa7_0(active0, 0x20000000000L);
       case 101:
-         return jjMoveStringLiteralDfa7_0(active0, 0x1200000000000000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x2400000000000000L);
       case 105:
-         return jjMoveStringLiteralDfa7_0(active0, 0x40000000000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x80000000000L);
       case 110:
          if ((active0 & 0x40000L) != 0L)
             return jjStartNfaWithStates_0(6, 18, 74);
          return jjMoveStringLiteralDfa7_0(active0, 0x4000L);
       case 111:
-         return jjMoveStringLiteralDfa7_0(active0, 0x800000000000000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x1000000000000000L);
       case 116:
-         return jjMoveStringLiteralDfa7_0(active0, 0x18000000000000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x30000000000000L);
       default :
          break;
    }
@@ -752,17 +758,21 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0)
    switch(curChar)
    {
       case 68:
-         return jjMoveStringLiteralDfa8_0(active0, 0x8000000000000L);
-      case 84:
          return jjMoveStringLiteralDfa8_0(active0, 0x10000000000000L);
+      case 84:
+         return jjMoveStringLiteralDfa8_0(active0, 0x20000000000000L);
       case 97:
-         return jjMoveStringLiteralDfa8_0(active0, 0x200000000000000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x400000000000000L);
       case 101:
-         return jjMoveStringLiteralDfa8_0(active0, 0x1000000000000000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x2000000000000000L);
       case 110:
-         return jjMoveStringLiteralDfa8_0(active0, 0x800040000000000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x1000080000000000L);
       case 111:
          return jjMoveStringLiteralDfa8_0(active0, 0x4000L);
+      case 116:
+         if ((active0 & 0x20000000000L) != 0L)
+            return jjStartNfaWithStates_0(7, 41, 74);
+         break;
       default :
          break;
    }
@@ -780,23 +790,23 @@ private int jjMoveStringLiteralDfa8_0(long old0, long active0)
    switch(curChar)
    {
       case 97:
-         return jjMoveStringLiteralDfa9_0(active0, 0x8000000000000L);
+         return jjMoveStringLiteralDfa9_0(active0, 0x10000000000000L);
       case 103:
-         if ((active0 & 0x40000000000L) != 0L)
-            return jjStartNfaWithStates_0(8, 42, 74);
+         if ((active0 & 0x80000000000L) != 0L)
+            return jjStartNfaWithStates_0(8, 43, 74);
          break;
       case 105:
-         return jjMoveStringLiteralDfa9_0(active0, 0x10000000000000L);
+         return jjMoveStringLiteralDfa9_0(active0, 0x20000000000000L);
       case 107:
-         if ((active0 & 0x1000000000000000L) != 0L)
-            return jjStartNfaWithStates_0(8, 60, 74);
+         if ((active0 & 0x2000000000000000L) != 0L)
+            return jjStartNfaWithStates_0(8, 61, 74);
          break;
       case 114:
-         if ((active0 & 0x200000000000000L) != 0L)
-            return jjStartNfaWithStates_0(8, 57, 74);
+         if ((active0 & 0x400000000000000L) != 0L)
+            return jjStartNfaWithStates_0(8, 58, 74);
          return jjMoveStringLiteralDfa9_0(active0, 0x4000L);
       case 116:
-         return jjMoveStringLiteralDfa9_0(active0, 0x800000000000000L);
+         return jjMoveStringLiteralDfa9_0(active0, 0x1000000000000000L);
       default :
          break;
    }
@@ -816,13 +826,13 @@ private int jjMoveStringLiteralDfa9_0(long old0, long active0)
       case 101:
          return jjMoveStringLiteralDfa10_0(active0, 0x4000L);
       case 104:
-         if ((active0 & 0x800000000000000L) != 0L)
-            return jjStartNfaWithStates_0(9, 59, 74);
+         if ((active0 & 0x1000000000000000L) != 0L)
+            return jjStartNfaWithStates_0(9, 60, 74);
          break;
       case 109:
-         return jjMoveStringLiteralDfa10_0(active0, 0x10000000000000L);
+         return jjMoveStringLiteralDfa10_0(active0, 0x20000000000000L);
       case 116:
-         return jjMoveStringLiteralDfa10_0(active0, 0x8000000000000L);
+         return jjMoveStringLiteralDfa10_0(active0, 0x10000000000000L);
       default :
          break;
    }
@@ -842,10 +852,10 @@ private int jjMoveStringLiteralDfa10_0(long old0, long active0)
       case 67:
          return jjMoveStringLiteralDfa11_0(active0, 0x4000L);
       case 101:
-         if ((active0 & 0x8000000000000L) != 0L)
-            return jjStartNfaWithStates_0(10, 51, 74);
-         else if ((active0 & 0x10000000000000L) != 0L)
-            return jjStartNfaWithStates_0(10, 52, 26);
+         if ((active0 & 0x10000000000000L) != 0L)
+            return jjStartNfaWithStates_0(10, 52, 74);
+         else if ((active0 & 0x20000000000000L) != 0L)
+            return jjStartNfaWithStates_0(10, 53, 26);
          break;
       default :
          break;
@@ -937,324 +947,324 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 26:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddTwoStates(72, 73);
                   }
                   else if (curChar == 43)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                   }
                   else if (curChar == 46)
                      jjstateSet[jjnewStateCnt++] = 70;
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(0, 2);
                   }
                   else if (curChar == 43)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAdd(69);
                   }
                   break;
                case 32:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddTwoStates(72, 73);
                   }
                   else if (curChar == 43)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                   }
                   else if (curChar == 46)
                      jjstateSet[jjnewStateCnt++] = 70;
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(0, 2);
                   }
                   else if (curChar == 43)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAdd(69);
                   }
                   break;
                case 63:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddTwoStates(72, 73);
                   }
                   else if (curChar == 43)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                   }
                   else if (curChar == 46)
                      jjstateSet[jjnewStateCnt++] = 70;
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(0, 2);
                   }
                   else if (curChar == 43)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAdd(69);
                   }
                   break;
                case 5:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddTwoStates(72, 73);
                   }
                   else if (curChar == 43)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                   }
                   else if (curChar == 46)
                      jjstateSet[jjnewStateCnt++] = 70;
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(0, 2);
                   }
                   else if (curChar == 43)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAdd(69);
                   }
                   break;
                case 64:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddTwoStates(72, 73);
                   }
                   else if (curChar == 43)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                   }
                   else if (curChar == 46)
                      jjstateSet[jjnewStateCnt++] = 70;
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(0, 2);
                   }
                   else if (curChar == 43)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAdd(69);
                   }
                   break;
                case 30:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddTwoStates(72, 73);
                   }
                   else if (curChar == 43)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                   }
                   else if (curChar == 46)
                      jjstateSet[jjnewStateCnt++] = 70;
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(0, 2);
                   }
                   else if (curChar == 43)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAdd(69);
                   }
                   break;
                case 29:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddTwoStates(72, 73);
                   }
                   else if (curChar == 43)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                   }
                   else if (curChar == 46)
                      jjstateSet[jjnewStateCnt++] = 70;
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(0, 2);
                   }
                   else if (curChar == 43)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAdd(69);
                   }
                   break;
                case 35:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddTwoStates(72, 73);
                   }
                   else if (curChar == 43)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                   }
                   else if (curChar == 46)
                      jjstateSet[jjnewStateCnt++] = 70;
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(0, 2);
                   }
                   else if (curChar == 43)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAdd(69);
                   }
                   break;
                case 27:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddTwoStates(72, 73);
                   }
                   else if (curChar == 43)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                   }
                   else if (curChar == 46)
                      jjstateSet[jjnewStateCnt++] = 70;
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(0, 2);
                   }
                   else if (curChar == 43)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAdd(69);
                   }
                   break;
                case 33:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddTwoStates(72, 73);
                   }
                   else if (curChar == 43)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                   }
                   else if (curChar == 46)
                      jjstateSet[jjnewStateCnt++] = 70;
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(0, 2);
                   }
                   else if (curChar == 43)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAdd(69);
                   }
                   break;
                case 6:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddTwoStates(72, 73);
                   }
                   else if (curChar == 43)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                   }
                   else if (curChar == 46)
                      jjstateSet[jjnewStateCnt++] = 70;
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(0, 2);
                   }
                   else if (curChar == 43)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAdd(69);
                   }
                   break;
                case 74:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddTwoStates(72, 73);
                   }
                   else if (curChar == 43)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                   }
                   else if (curChar == 46)
                      jjstateSet[jjnewStateCnt++] = 70;
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(0, 2);
                   }
                   else if (curChar == 43)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAdd(69);
                   }
                   break;
@@ -1265,137 +1275,137 @@ private int jjMoveNfa_0(int startState, int curPos)
                      jjCheckNAdd(42);
                   if ((0x3fe000000000000L & l) != 0L)
                   {
-                     if (kind > 81)
-                        kind = 81;
+                     if (kind > 82)
+                        kind = 82;
                      jjCheckNAddTwoStates(39, 40);
                   }
                   else if (curChar == 48)
                   {
-                     if (kind > 81)
-                        kind = 81;
+                     if (kind > 82)
+                        kind = 82;
                      jjCheckNAddStates(9, 11);
                   }
                   break;
                case 31:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddTwoStates(72, 73);
                   }
                   else if (curChar == 43)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                   }
                   else if (curChar == 46)
                      jjstateSet[jjnewStateCnt++] = 70;
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(0, 2);
                   }
                   else if (curChar == 43)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAdd(69);
                   }
                   break;
                case 36:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddTwoStates(72, 73);
                   }
                   else if (curChar == 43)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                   }
                   else if (curChar == 46)
                      jjstateSet[jjnewStateCnt++] = 70;
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(0, 2);
                   }
                   else if (curChar == 43)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAdd(69);
                   }
                   break;
                case 28:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddTwoStates(72, 73);
                   }
                   else if (curChar == 43)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                   }
                   else if (curChar == 46)
                      jjstateSet[jjnewStateCnt++] = 70;
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(0, 2);
                   }
                   else if (curChar == 43)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAdd(69);
                   }
                   break;
                case 34:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddTwoStates(72, 73);
                   }
                   else if (curChar == 43)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                   }
                   else if (curChar == 46)
                      jjstateSet[jjnewStateCnt++] = 70;
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(0, 2);
                   }
                   else if (curChar == 43)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAdd(69);
                   }
                   break;
                case 38:
                   if ((0x3fe000000000000L & l) == 0L)
                      break;
-                  if (kind > 81)
-                     kind = 81;
+                  if (kind > 82)
+                     kind = 82;
                   jjCheckNAddTwoStates(39, 40);
                   break;
                case 39:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 81)
-                     kind = 81;
+                  if (kind > 82)
+                     kind = 82;
                   jjCheckNAddTwoStates(39, 40);
                   break;
                case 41:
@@ -1405,8 +1415,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 42:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 82)
-                     kind = 82;
+                  if (kind > 83)
+                     kind = 83;
                   jjCheckNAddStates(12, 14);
                   break;
                case 44:
@@ -1416,8 +1426,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 45:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 82)
-                     kind = 82;
+                  if (kind > 83)
+                     kind = 83;
                   jjCheckNAddTwoStates(45, 46);
                   break;
                case 47:
@@ -1431,15 +1441,15 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 49:
                   if (curChar != 46)
                      break;
-                  if (kind > 82)
-                     kind = 82;
+                  if (kind > 83)
+                     kind = 83;
                   jjCheckNAddStates(15, 17);
                   break;
                case 50:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 82)
-                     kind = 82;
+                  if (kind > 83)
+                     kind = 83;
                   jjCheckNAddStates(15, 17);
                   break;
                case 51:
@@ -1453,8 +1463,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 54:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 82)
-                     kind = 82;
+                  if (kind > 83)
+                     kind = 83;
                   jjCheckNAddTwoStates(54, 46);
                   break;
                case 55:
@@ -1464,36 +1474,36 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 56:
                   if (curChar != 48)
                      break;
-                  if (kind > 81)
-                     kind = 81;
+                  if (kind > 82)
+                     kind = 82;
                   jjCheckNAddStates(9, 11);
                   break;
                case 57:
                   if ((0xff000000000000L & l) == 0L)
                      break;
-                  if (kind > 81)
-                     kind = 81;
+                  if (kind > 82)
+                     kind = 82;
                   jjCheckNAddTwoStates(57, 40);
                   break;
                case 59:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 81)
-                     kind = 81;
+                  if (kind > 82)
+                     kind = 82;
                   jjCheckNAddTwoStates(59, 40);
                   break;
                case 67:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 69)
-                     kind = 69;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddStates(0, 2);
                   break;
                case 68:
                   if (curChar != 43)
                      break;
-                  if (kind > 69)
-                     kind = 69;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAdd(69);
                   break;
                case 69:
@@ -1503,20 +1513,20 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 71:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 69)
-                     kind = 69;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddStates(18, 20);
                   break;
                case 72:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 70)
-                     kind = 70;
+                  if (kind > 71)
+                     kind = 71;
                   jjCheckNAddTwoStates(72, 73);
                   break;
                case 73:
-                  if (curChar == 43 && kind > 70)
-                     kind = 70;
+                  if (curChar == 43 && kind > 71)
+                     kind = 71;
                   break;
                default : break;
             }
@@ -1532,14 +1542,14 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 26:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddTwoStates(72, 73);
                   }
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(0, 2);
                   }
                   if (curChar == 115)
@@ -1548,14 +1558,14 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 32:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddTwoStates(72, 73);
                   }
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(0, 2);
                   }
                   if (curChar == 110)
@@ -1564,14 +1574,14 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 63:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddTwoStates(72, 73);
                   }
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(0, 2);
                   }
                   if (curChar == 111)
@@ -1582,14 +1592,14 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 5:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddTwoStates(72, 73);
                   }
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(0, 2);
                   }
                   if (curChar == 117)
@@ -1598,33 +1608,33 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 64:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddTwoStates(72, 73);
                   }
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(0, 2);
                   }
                   if (curChar == 119)
                   {
-                     if (kind > 53)
-                        kind = 53;
+                     if (kind > 54)
+                        kind = 54;
                   }
                   break;
                case 30:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddTwoStates(72, 73);
                   }
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(0, 2);
                   }
                   if (curChar == 84)
@@ -1633,14 +1643,14 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 29:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddTwoStates(72, 73);
                   }
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(0, 2);
                   }
                   if (curChar == 105)
@@ -1649,14 +1659,14 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 35:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddTwoStates(72, 73);
                   }
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(0, 2);
                   }
                   if (curChar == 114)
@@ -1665,14 +1675,14 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 27:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddTwoStates(72, 73);
                   }
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(0, 2);
                   }
                   if (curChar == 101)
@@ -1681,14 +1691,14 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 33:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddTwoStates(72, 73);
                   }
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(0, 2);
                   }
                   if (curChar == 101)
@@ -1697,14 +1707,14 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 6:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddTwoStates(72, 73);
                   }
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(0, 2);
                   }
                   if (curChar == 114)
@@ -1713,22 +1723,22 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 74:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddTwoStates(72, 73);
                   }
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(0, 2);
                   }
                   break;
                case 3:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(21, 25);
                   }
                   if (curChar == 110)
@@ -1749,14 +1759,14 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 31:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddTwoStates(72, 73);
                   }
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(0, 2);
                   }
                   if (curChar == 116)
@@ -1765,14 +1775,14 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 36:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddTwoStates(72, 73);
                   }
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(0, 2);
                   }
                   if (curChar == 117)
@@ -1781,14 +1791,14 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 28:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddTwoStates(72, 73);
                   }
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(0, 2);
                   }
                   if (curChar == 109)
@@ -1797,14 +1807,14 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 34:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 70)
-                        kind = 70;
+                     if (kind > 71)
+                        kind = 71;
                      jjCheckNAddTwoStates(72, 73);
                   }
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 69)
-                        kind = 69;
+                     if (kind > 70)
+                        kind = 70;
                      jjCheckNAddStates(0, 2);
                   }
                   if (curChar == 114)
@@ -1887,8 +1897,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                      jjstateSet[jjnewStateCnt++] = 20;
                   break;
                case 22:
-                  if (curChar == 112 && kind > 53)
-                     kind = 53;
+                  if (curChar == 112 && kind > 54)
+                     kind = 54;
                   break;
                case 23:
                   if (curChar == 109)
@@ -1907,16 +1917,16 @@ private int jjMoveNfa_0(int startState, int curPos)
                      jjstateSet[jjnewStateCnt++] = 36;
                   break;
                case 40:
-                  if ((0x110000001100L & l) != 0L && kind > 81)
-                     kind = 81;
+                  if ((0x110000001100L & l) != 0L && kind > 82)
+                     kind = 82;
                   break;
                case 43:
                   if ((0x2000000020L & l) != 0L)
                      jjAddStates(28, 29);
                   break;
                case 46:
-                  if ((0x5400000054L & l) != 0L && kind > 82)
-                     kind = 82;
+                  if ((0x5400000054L & l) != 0L && kind > 83)
+                     kind = 83;
                   break;
                case 52:
                   if ((0x2000000020L & l) != 0L)
@@ -1929,8 +1939,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 59:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 81)
-                     kind = 81;
+                  if (kind > 82)
+                     kind = 82;
                   jjCheckNAddTwoStates(59, 40);
                   break;
                case 60:
@@ -1952,30 +1962,30 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 66:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 69)
-                     kind = 69;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddStates(21, 25);
                   break;
                case 67:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 69)
-                     kind = 69;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddStates(0, 2);
                   break;
                case 70:
                case 71:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 69)
-                     kind = 69;
+                  if (kind > 70)
+                     kind = 70;
                   jjCheckNAddStates(18, 20);
                   break;
                case 72:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 70)
-                     kind = 70;
+                  if (kind > 71)
+                     kind = 71;
                   jjCheckNAddTwoStates(72, 73);
                   break;
                default : break;
@@ -2027,7 +2037,7 @@ private int jjMoveStringLiteralDfa0_1()
    switch(curChar)
    {
       case 39:
-         return jjStopAtPos(0, 77);
+         return jjStopAtPos(0, 78);
       default :
          return jjMoveNfa_1(0, 0);
    }
@@ -2057,12 +2067,12 @@ private int jjMoveNfa_1(int startState, int curPos)
             switch(jjstateSet[--i])
             {
                case 0:
-                  if ((0xffffff7fffffffffL & l) != 0L && kind > 76)
-                     kind = 76;
+                  if ((0xffffff7fffffffffL & l) != 0L && kind > 77)
+                     kind = 77;
                   break;
                case 1:
-                  if ((0x8400000000L & l) != 0L && kind > 75)
-                     kind = 75;
+                  if ((0x8400000000L & l) != 0L && kind > 76)
+                     kind = 76;
                   break;
                case 2:
                   if ((0xf000000000000L & l) != 0L)
@@ -2071,13 +2081,13 @@ private int jjMoveNfa_1(int startState, int curPos)
                case 3:
                   if ((0xff000000000000L & l) == 0L)
                      break;
-                  if (kind > 75)
-                     kind = 75;
+                  if (kind > 76)
+                     kind = 76;
                   jjstateSet[jjnewStateCnt++] = 4;
                   break;
                case 4:
-                  if ((0xff000000000000L & l) != 0L && kind > 75)
-                     kind = 75;
+                  if ((0xff000000000000L & l) != 0L && kind > 76)
+                     kind = 76;
                   break;
                default : break;
             }
@@ -2093,19 +2103,19 @@ private int jjMoveNfa_1(int startState, int curPos)
                case 0:
                   if ((0xffffffffefffffffL & l) != 0L)
                   {
-                     if (kind > 76)
-                        kind = 76;
+                     if (kind > 77)
+                        kind = 77;
                   }
                   else if (curChar == 92)
                      jjAddStates(32, 34);
                   break;
                case 1:
-                  if ((0x14404510000000L & l) != 0L && kind > 75)
-                     kind = 75;
+                  if ((0x14404510000000L & l) != 0L && kind > 76)
+                     kind = 76;
                   break;
                case 5:
-                  if ((0xffffffffefffffffL & l) != 0L && kind > 76)
-                     kind = 76;
+                  if ((0xffffffffefffffffL & l) != 0L && kind > 77)
+                     kind = 77;
                   break;
                default : break;
             }
@@ -2123,8 +2133,8 @@ private int jjMoveNfa_1(int startState, int curPos)
             switch(jjstateSet[--i])
             {
                case 0:
-                  if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 76)
-                     kind = 76;
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 77)
+                     kind = 77;
                   break;
                default : break;
             }
@@ -2160,7 +2170,7 @@ private int jjMoveStringLiteralDfa0_2()
    switch(curChar)
    {
       case 34:
-         return jjStopAtPos(0, 80);
+         return jjStopAtPos(0, 81);
       default :
          return jjMoveNfa_2(0, 0);
    }
@@ -2184,12 +2194,12 @@ private int jjMoveNfa_2(int startState, int curPos)
             switch(jjstateSet[--i])
             {
                case 0:
-                  if ((0xfffffffbffffffffL & l) != 0L && kind > 79)
-                     kind = 79;
+                  if ((0xfffffffbffffffffL & l) != 0L && kind > 80)
+                     kind = 80;
                   break;
                case 1:
-                  if ((0x8400000000L & l) != 0L && kind > 78)
-                     kind = 78;
+                  if ((0x8400000000L & l) != 0L && kind > 79)
+                     kind = 79;
                   break;
                case 2:
                   if ((0xf000000000000L & l) != 0L)
@@ -2198,13 +2208,13 @@ private int jjMoveNfa_2(int startState, int curPos)
                case 3:
                   if ((0xff000000000000L & l) == 0L)
                      break;
-                  if (kind > 78)
-                     kind = 78;
+                  if (kind > 79)
+                     kind = 79;
                   jjstateSet[jjnewStateCnt++] = 4;
                   break;
                case 4:
-                  if ((0xff000000000000L & l) != 0L && kind > 78)
-                     kind = 78;
+                  if ((0xff000000000000L & l) != 0L && kind > 79)
+                     kind = 79;
                   break;
                default : break;
             }
@@ -2220,19 +2230,19 @@ private int jjMoveNfa_2(int startState, int curPos)
                case 0:
                   if ((0xffffffffefffffffL & l) != 0L)
                   {
-                     if (kind > 79)
-                        kind = 79;
+                     if (kind > 80)
+                        kind = 80;
                   }
                   else if (curChar == 92)
                      jjAddStates(32, 34);
                   break;
                case 1:
-                  if ((0x14404510000000L & l) != 0L && kind > 78)
-                     kind = 78;
+                  if ((0x14404510000000L & l) != 0L && kind > 79)
+                     kind = 79;
                   break;
                case 5:
-                  if ((0xffffffffefffffffL & l) != 0L && kind > 79)
-                     kind = 79;
+                  if ((0xffffffffefffffffL & l) != 0L && kind > 80)
+                     kind = 80;
                   break;
                default : break;
             }
@@ -2250,8 +2260,8 @@ private int jjMoveNfa_2(int startState, int curPos)
             switch(jjstateSet[--i])
             {
                case 0:
-                  if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 79)
-                     kind = 79;
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 80)
+                     kind = 80;
                   break;
                default : break;
             }
@@ -2295,15 +2305,16 @@ public static final String[] jjstrLiteralImages = {
 "\154\151\153\145\111\147\156\157\162\145\103\141\163\145", "\151\156", "\50", "\51", "\142\145\164\167\145\145\156", "\54", "\174", 
 "\136", "\46", "\74\74", "\76\76", "\53", "\55", "\57", "\176", null, null, null, null, 
 null, null, null, "\141\166\147", "\155\151\156", "\155\141\170", "\163\165\155", 
-"\143\157\165\156\164", "\143\157\156\143\141\164", "\163\165\142\163\164\162\151\156\147", 
-"\164\162\151\155", "\154\157\167\145\162", "\165\160\160\145\162", "\154\145\156\147\164\150", 
-"\154\157\143\141\164\145", "\141\142\163", "\163\161\162\164", "\155\157\144", 
-"\143\165\162\162\145\156\164\104\141\164\145", "\143\165\162\162\145\156\164\124\151\155\145", null, "\171\145\141\162", 
-"\155\157\156\164\150", "\167\145\145\153", "\144\141\171\117\146\131\145\141\162", "\144\141\171", 
-"\144\141\171\117\146\115\157\156\164\150", "\144\141\171\117\146\127\145\145\153", "\150\157\165\162", 
-"\155\151\156\165\164\145", "\163\145\143\157\156\144", "\44", "\157\142\152\72", "\144\142\72", 
-"\145\156\165\155\72", "\52", null, null, null, null, null, null, null, null, null, null, null, null, 
-null, null, null, null, null, null, };
+"\143\157\165\156\164", "\144\151\163\164\151\156\143\164", "\143\157\156\143\141\164", 
+"\163\165\142\163\164\162\151\156\147", "\164\162\151\155", "\154\157\167\145\162", "\165\160\160\145\162", 
+"\154\145\156\147\164\150", "\154\157\143\141\164\145", "\141\142\163", "\163\161\162\164", 
+"\155\157\144", "\143\165\162\162\145\156\164\104\141\164\145", 
+"\143\165\162\162\145\156\164\124\151\155\145", null, "\171\145\141\162", "\155\157\156\164\150", "\167\145\145\153", 
+"\144\141\171\117\146\131\145\141\162", "\144\141\171", "\144\141\171\117\146\115\157\156\164\150", 
+"\144\141\171\117\146\127\145\145\153", "\150\157\165\162", "\155\151\156\165\164\145", "\163\145\143\157\156\144", 
+"\44", "\157\142\152\72", "\144\142\72", "\145\156\165\155\72", "\52", 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 = {
@@ -2316,17 +2327,17 @@ public static final String[] lexStateNames = {
 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, 2, 
-   -1, -1, 0, -1, -1, 0, -1, -1, -1, -1, -1, -1, 
+   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, 
+   2, -1, -1, 0, -1, -1, 0, -1, -1, -1, -1, -1, -1, 
 };
 static final long[] jjtoToken = {
-   0xfffffffe1fffffffL, 0x7207fL, 
+   0xfffffffe1fffffffL, 0xe40ffL, 
 };
 static final long[] jjtoSkip = {
    0x1e0000000L, 0x0L, 
 };
 static final long[] jjtoMore = {
-   0x0L, 0xde00L, 
+   0x0L, 0x1bc00L, 
 };
 protected JavaCharStream input_stream;
 private final int[] jjrounds = new int[74];
@@ -2518,32 +2529,32 @@ void MoreLexicalActions()
    jjimageLen += (lengthOfMatch = jjmatchedPos + 1);
    switch(jjmatchedKind)
    {
-      case 73 :
+      case 74 :
          image.append(input_stream.GetSuffix(jjimageLen));
          jjimageLen = 0;
            stringBuffer = new StringBuffer();
          break;
-      case 74 :
+      case 75 :
          image.append(input_stream.GetSuffix(jjimageLen));
          jjimageLen = 0;
             stringBuffer = new StringBuffer();
          break;
-      case 75 :
+      case 76 :
          image.append(input_stream.GetSuffix(jjimageLen));
          jjimageLen = 0;
           stringBuffer.append( escapeChar() );
          break;
-      case 76 :
+      case 77 :
          image.append(input_stream.GetSuffix(jjimageLen));
          jjimageLen = 0;
           stringBuffer.append( image.charAt(image.length()-1) );
          break;
-      case 78 :
+      case 79 :
          image.append(input_stream.GetSuffix(jjimageLen));
          jjimageLen = 0;
           stringBuffer.append( escapeChar() );
          break;
-      case 79 :
+      case 80 :
          image.append(input_stream.GetSuffix(jjimageLen));
          jjimageLen = 0;
           stringBuffer.append( image.charAt(image.length()-1) );
@@ -2556,19 +2567,19 @@ void TokenLexicalActions(Token matchedToken)
 {
    switch(jjmatchedKind)
    {
-      case 77 :
+      case 78 :
         image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
           literalValue = stringBuffer.toString();
          break;
-      case 80 :
+      case 81 :
         image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
           literalValue = stringBuffer.toString();
          break;
-      case 81 :
+      case 82 :
         image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
           literalValue = makeInt();
          break;
-      case 82 :
+      case 83 :
         image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
           literalValue = makeFloat();
          break;

http://git-wip-us.apache.org/repos/asf/cayenne/blob/54b3f811/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ExpressionParserTreeConstants.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ExpressionParserTreeConstants.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ExpressionParserTreeConstants.java
index 15d5de3..97cc9d1 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ExpressionParserTreeConstants.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ExpressionParserTreeConstants.java
@@ -1,23 +1,4 @@
 /* Generated By:JavaCC: Do not edit this line. ExpressionParserTreeConstants.java Version 5.0 */
-/*****************************************************************
- *   Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- ****************************************************************/
-
 package org.apache.cayenne.exp.parser;
 
 public interface ExpressionParserTreeConstants
@@ -75,10 +56,11 @@ public interface ExpressionParserTreeConstants
   public int JJTCURRENTTIME = 50;
   public int JJTCURRENTTIMESTAMP = 51;
   public int JJTEXTRACT = 52;
-  public int JJTNAMEDPARAMETER = 53;
-  public int JJTOBJPATH = 54;
-  public int JJTDBPATH = 55;
-  public int JJTENUM = 56;
+  public int JJTDISTINCT = 53;
+  public int JJTNAMEDPARAMETER = 54;
+  public int JJTOBJPATH = 55;
+  public int JJTDBPATH = 56;
+  public int JJTENUM = 57;
 
 
   public String[] jjtNodeName = {
@@ -135,10 +117,11 @@ public interface ExpressionParserTreeConstants
     "CurrentTime",
     "CurrentTimestamp",
     "Extract",
+    "Distinct",
     "NamedParameter",
     "ObjPath",
     "DbPath",
     "Enum",
   };
 }
-/* JavaCC - OriginalChecksum=6976e9a526d76d12c8693beadbe8a363 (do not edit this line) */
+/* JavaCC - OriginalChecksum=887631d60a8b59c21effca16e8257a84 (do not edit this line) */


Mime
View raw message