hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r575156 [3/3] - in /lucene/hadoop/trunk/src/contrib/hbase: ./ src/java/org/apache/hadoop/hbase/ src/java/org/apache/hadoop/hbase/shell/ src/java/org/apache/hadoop/hbase/shell/generated/ src/test/org/apache/hadoop/hbase/ src/test/org/apache/...
Date Thu, 13 Sep 2007 04:01:07 GMT
Modified: lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserTokenManager.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserTokenManager.java?rev=575156&r1=575155&r2=575156&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserTokenManager.java (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserTokenManager.java Wed Sep 12 21:01:05 2007
@@ -1,4 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. ParserTokenManager.java */
+package org.apache.hadoop.hbase.shell.generated;
 /**
  * Copyright 2007 The Apache Software Foundation
  *
@@ -18,7 +19,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.hadoop.hbase.shell.generated;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -36,125 +37,195 @@
    switch (pos)
    {
       case 0:
-         if ((active0 & 0x1ffffe0L) != 0L)
+         if ((active0 & 0x400000000L) != 0L)
+            return 31;
+         if ((active0 & 0x7fff01ffffffe0L) != 0L)
          {
-            jjmatchedKind = 32;
-            return 13;
+            jjmatchedKind = 55;
+            return 0;
          }
-         if ((active0 & 0x84000000L) != 0L)
-            return 1;
          return -1;
       case 1:
-         if ((active0 & 0x1000800L) != 0L)
-            return 13;
-         if ((active0 & 0xfff7e0L) != 0L)
+         if ((active0 & 0x100002000L) != 0L)
+            return 0;
+         if ((active0 & 0x7fff00ffffdfe0L) != 0L)
          {
-            jjmatchedKind = 32;
+            jjmatchedKind = 55;
             jjmatchedPos = 1;
-            return 13;
+            return 0;
          }
          return -1;
       case 2:
-         if ((active0 & 0x810000L) != 0L)
-            return 13;
-         if ((active0 & 0x7ef7e0L) != 0L)
+         if ((active0 & 0x20000082000000L) != 0L)
+            return 0;
+         if ((active0 & 0x5fff007dffdfe0L) != 0L)
          {
-            jjmatchedKind = 32;
+            jjmatchedKind = 55;
             jjmatchedPos = 2;
-            return 13;
+            return 0;
          }
          return -1;
       case 3:
-         if ((active0 & 0x7ae340L) != 0L)
+         if ((active0 & 0x80001015720L) != 0L)
+            return 0;
+         if ((active0 & 0x5ff7007cfe88c0L) != 0L)
          {
-            jjmatchedKind = 32;
-            jjmatchedPos = 3;
-            return 13;
+            if (jjmatchedPos != 3)
+            {
+               jjmatchedKind = 55;
+               jjmatchedPos = 3;
+            }
+            return 0;
          }
-         if ((active0 & 0x414a0L) != 0L)
-            return 13;
          return -1;
       case 4:
-         if ((active0 & 0x600040L) != 0L)
-            return 13;
-         if ((active0 & 0x1ae300L) != 0L)
+         if ((active0 & 0x1000408200c0L) != 0L)
+            return 0;
+         if ((active0 & 0x5fe7003c7c8a00L) != 0L)
          {
-            jjmatchedKind = 32;
+            jjmatchedKind = 55;
             jjmatchedPos = 4;
-            return 13;
+            return 0;
          }
          return -1;
       case 5:
-         if ((active0 & 0x1ae200L) != 0L)
-            return 13;
-         if ((active0 & 0x100L) != 0L)
+         if ((active0 & 0x402000041c8800L) != 0L)
+            return 0;
+         if ((active0 & 0x1fc70038600200L) != 0L)
          {
-            if (jjmatchedPos != 5)
-            {
-               jjmatchedKind = 32;
-               jjmatchedPos = 5;
-            }
-            return 13;
+            jjmatchedKind = 55;
+            jjmatchedPos = 5;
+            return 0;
          }
          return -1;
       case 6:
-         if ((active0 & 0x100100L) != 0L)
+         if ((active0 & 0x200000L) != 0L)
+            return 0;
+         if ((active0 & 0x1fc70038400200L) != 0L)
          {
-            jjmatchedKind = 32;
+            jjmatchedKind = 55;
             jjmatchedPos = 6;
-            return 13;
+            return 0;
          }
          return -1;
       case 7:
-         if ((active0 & 0x100L) != 0L)
-            return 13;
-         if ((active0 & 0x100000L) != 0L)
+         if ((active0 & 0x8000000400200L) != 0L)
+            return 0;
+         if ((active0 & 0x17c70038000000L) != 0L)
          {
-            jjmatchedKind = 32;
+            jjmatchedKind = 55;
             jjmatchedPos = 7;
-            return 13;
+            return 0;
          }
          return -1;
       case 8:
-         if ((active0 & 0x100000L) != 0L)
+         if ((active0 & 0x400010000000L) != 0L)
+            return 0;
+         if ((active0 & 0x17870028000000L) != 0L)
          {
-            jjmatchedKind = 32;
+            jjmatchedKind = 55;
             jjmatchedPos = 8;
-            return 13;
+            return 0;
          }
          return -1;
       case 9:
-         if ((active0 & 0x100000L) != 0L)
+         if ((active0 & 0x20000000000L) != 0L)
+            return 0;
+         if ((active0 & 0x17850028000000L) != 0L)
          {
-            jjmatchedKind = 32;
+            jjmatchedKind = 55;
             jjmatchedPos = 9;
-            return 13;
+            return 0;
          }
          return -1;
       case 10:
-         if ((active0 & 0x100000L) != 0L)
+         if ((active0 & 0x14840000000000L) != 0L)
+            return 0;
+         if ((active0 & 0x3010028000000L) != 0L)
          {
-            jjmatchedKind = 32;
+            jjmatchedKind = 55;
             jjmatchedPos = 10;
-            return 13;
+            return 0;
          }
          return -1;
       case 11:
-         if ((active0 & 0x100000L) != 0L)
+         if ((active0 & 0x10020000000L) != 0L)
+            return 0;
+         if ((active0 & 0x3000008000000L) != 0L)
          {
-            jjmatchedKind = 32;
+            jjmatchedKind = 55;
             jjmatchedPos = 11;
-            return 13;
+            return 0;
          }
          return -1;
       case 12:
-         if ((active0 & 0x100000L) != 0L)
+         if ((active0 & 0x3000008000000L) != 0L)
          {
-            jjmatchedKind = 32;
+            jjmatchedKind = 55;
             jjmatchedPos = 12;
-            return 13;
+            return 0;
+         }
+         return -1;
+      case 13:
+         if ((active0 & 0x8000000L) != 0L)
+            return 0;
+         if ((active0 & 0x3000000000000L) != 0L)
+         {
+            jjmatchedKind = 55;
+            jjmatchedPos = 13;
+            return 0;
          }
          return -1;
+      case 14:
+         if ((active0 & 0x3000000000000L) != 0L)
+         {
+            jjmatchedKind = 55;
+            jjmatchedPos = 14;
+            return 0;
+         }
+         return -1;
+      case 15:
+         if ((active0 & 0x3000000000000L) != 0L)
+         {
+            jjmatchedKind = 55;
+            jjmatchedPos = 15;
+            return 0;
+         }
+         return -1;
+      case 16:
+         if ((active0 & 0x3000000000000L) != 0L)
+         {
+            jjmatchedKind = 55;
+            jjmatchedPos = 16;
+            return 0;
+         }
+         return -1;
+      case 17:
+         if ((active0 & 0x3000000000000L) != 0L)
+         {
+            jjmatchedKind = 55;
+            jjmatchedPos = 17;
+            return 0;
+         }
+         return -1;
+      case 18:
+         if ((active0 & 0x3000000000000L) != 0L)
+         {
+            jjmatchedKind = 55;
+            jjmatchedPos = 18;
+            return 0;
+         }
+         return -1;
+      case 19:
+         if ((active0 & 0x2000000000000L) != 0L)
+         {
+            jjmatchedKind = 55;
+            jjmatchedPos = 19;
+            return 0;
+         }
+         if ((active0 & 0x1000000000000L) != 0L)
+            return 0;
+         return -1;
       default :
          return -1;
    }
@@ -182,65 +253,74 @@
    switch(curChar)
    {
       case 40:
-         return jjStopAtPos(0, 27);
+         return jjStopAtPos(0, 35);
       case 41:
-         return jjStopAtPos(0, 28);
+         return jjStopAtPos(0, 36);
+      case 42:
+         return jjStopAtPos(0, 39);
       case 44:
-         return jjStopAtPos(0, 25);
-      case 45:
-         return jjStartNfaWithStates_0(0, 31, 1);
+         return jjStopAtPos(0, 33);
       case 46:
-         return jjStartNfaWithStates_0(0, 26, 1);
+         return jjStartNfaWithStates_0(0, 34, 31);
       case 59:
-         return jjStopAtPos(0, 37);
+         return jjStopAtPos(0, 61);
       case 60:
-         return jjMoveStringLiteralDfa1_0(0x40000000L);
+         return jjMoveStringLiteralDfa1_0(0x4000000000L);
       case 61:
-         return jjStopAtPos(0, 29);
+         return jjStopAtPos(0, 37);
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa1_0(0x800000L);
+         return jjMoveStringLiteralDfa1_0(0x20000080000040L);
+      case 66:
+      case 98:
+         return jjMoveStringLiteralDfa1_0(0x900000000000L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa1_0(0x120240L);
+         return jjMoveStringLiteralDfa1_0(0x41040008000880L);
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa1_0(0x4500L);
+         return jjMoveStringLiteralDfa1_0(0x241600L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa1_0(0x1000L);
+         return jjMoveStringLiteralDfa1_0(0x104000L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa1_0(0x800L);
+         return jjMoveStringLiteralDfa1_0(0x1002000L);
       case 72:
       case 104:
          return jjMoveStringLiteralDfa1_0(0x20L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa1_0(0x2000L);
+         return jjMoveStringLiteralDfa1_0(0x400000018000L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa1_0(0x400000L);
+         return jjMoveStringLiteralDfa1_0(0x40000000L);
+      case 77:
+      case 109:
+         return jjMoveStringLiteralDfa1_0(0x30000000000L);
+      case 78:
+      case 110:
+         return jjMoveStringLiteralDfa1_0(0x18080020000000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa1_0(0x1000000L);
+         return jjMoveStringLiteralDfa1_0(0x100000000L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa1_0(0x10000L);
+         return jjMoveStringLiteralDfa1_0(0x2200002000000L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa1_0(0x8080L);
+         return jjMoveStringLiteralDfa1_0(0x480100L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa1_0(0x40000L);
+         return jjMoveStringLiteralDfa1_0(0x10020000L);
       case 86:
       case 118:
-         return jjMoveStringLiteralDfa1_0(0x80000L);
+         return jjMoveStringLiteralDfa1_0(0x4000004000000L);
       case 87:
       case 119:
-         return jjMoveStringLiteralDfa1_0(0x200000L);
+         return jjMoveStringLiteralDfa1_0(0x800000L);
       default :
-         return jjMoveNfa_0(0, 0);
+         return jjMoveNfa_0(1, 0);
    }
 }
 private final int jjMoveStringLiteralDfa1_0(long active0)
@@ -253,43 +333,52 @@
    switch(curChar)
    {
       case 62:
-         if ((active0 & 0x40000000L) != 0L)
-            return jjStopAtPos(1, 30);
+         if ((active0 & 0x4000000000L) != 0L)
+            return jjStopAtPos(1, 38);
          break;
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa2_0(active0, 0x80000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x30004020000L);
+      case 68:
+      case 100:
+         return jjMoveStringLiteralDfa2_0(active0, 0x20000000000000L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa2_0(active0, 0xc120L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x62000000c0620L);
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa2_0(active0, 0x200080L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x40000000800100L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa2_0(active0, 0x440000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x50200000L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa2_0(active0, 0x40L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x9000000000c0L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa2_0(active0, 0x802000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x400080118000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa2_0(active0, 0x130000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x10c000a000000L);
       case 82:
       case 114:
-         if ((active0 & 0x1000000L) != 0L)
-            return jjStartNfaWithStates_0(1, 24, 13);
-         return jjMoveStringLiteralDfa2_0(active0, 0x600L);
+         if ((active0 & 0x100000000L) != 0L)
+            return jjStartNfaWithStates_0(1, 32, 0);
+         return jjMoveStringLiteralDfa2_0(active0, 0x1001800L);
       case 83:
       case 115:
-         if ((active0 & 0x800L) != 0L)
-            return jjStartNfaWithStates_0(1, 11, 13);
+         if ((active0 & 0x2000L) != 0L)
+            return jjStartNfaWithStates_0(1, 13, 0);
          break;
+      case 84:
+      case 116:
+         return jjMoveStringLiteralDfa2_0(active0, 0x400000L);
+      case 85:
+      case 117:
+         return jjMoveStringLiteralDfa2_0(active0, 0x18000020000000L);
       case 88:
       case 120:
-         return jjMoveStringLiteralDfa2_0(active0, 0x1000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x4000L);
       default :
          break;
    }
@@ -306,34 +395,59 @@
    }
    switch(curChar)
    {
+      case 95:
+         return jjMoveStringLiteralDfa3_0(active0, 0x400000000000L);
+      case 65:
+      case 97:
+         return jjMoveStringLiteralDfa3_0(active0, 0x40000000500000L);
+      case 66:
+      case 98:
+         return jjMoveStringLiteralDfa3_0(active0, 0x20000L);
+      case 67:
+      case 99:
+         return jjMoveStringLiteralDfa3_0(active0, 0x4200000000000L);
       case 68:
       case 100:
-         if ((active0 & 0x800000L) != 0L)
-            return jjStartNfaWithStates_0(2, 23, 13);
+         if ((active0 & 0x80000000L) != 0L)
+            return jjStartNfaWithStates_0(2, 31, 0);
+         else if ((active0 & 0x20000000000000L) != 0L)
+            return jjStartNfaWithStates_0(2, 53, 0);
          break;
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa3_0(active0, 0x200240L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x800880L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa3_0(active0, 0x1000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4000L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa3_0(active0, 0x1ac020L);
+         return jjMoveStringLiteralDfa3_0(active0, 0xc0c0020L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa3_0(active0, 0x440000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x18040070000000L);
+      case 78:
+      case 110:
+         return jjMoveStringLiteralDfa3_0(active0, 0x80000000000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa3_0(active0, 0x480L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x900001001100L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa3_0(active0, 0x2100L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x208600L);
+      case 84:
+      case 116:
+         return jjMoveStringLiteralDfa3_0(active0, 0x2000000010040L);
+      case 85:
+      case 117:
+         return jjMoveStringLiteralDfa3_0(active0, 0x1000000000000L);
       case 87:
       case 119:
-         if ((active0 & 0x10000L) != 0L)
-            return jjStartNfaWithStates_0(2, 16, 13);
+         if ((active0 & 0x2000000L) != 0L)
+            return jjStartNfaWithStates_0(2, 25, 0);
          break;
+      case 88:
+      case 120:
+         return jjMoveStringLiteralDfa3_0(active0, 0x30000000000L);
       default :
          break;
    }
@@ -350,42 +464,68 @@
    }
    switch(curChar)
    {
+      case 95:
+         return jjMoveStringLiteralDfa4_0(active0, 0x18030020000000L);
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa4_0(active0, 0x240L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x200880L);
+      case 66:
+      case 98:
+         return jjMoveStringLiteralDfa4_0(active0, 0x100000L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa4_0(active0, 0x100L);
+         if ((active0 & 0x400L) != 0L)
+         {
+            jjmatchedKind = 10;
+            jjmatchedPos = 3;
+         }
+         return jjMoveStringLiteralDfa4_0(active0, 0x100000000200L);
       case 69:
       case 101:
-         if ((active0 & 0x40000L) != 0L)
-            return jjStartNfaWithStates_0(3, 18, 13);
-         return jjMoveStringLiteralDfa4_0(active0, 0xe000L);
+         if ((active0 & 0x80000000000L) != 0L)
+            return jjStartNfaWithStates_0(3, 43, 0);
+         return jjMoveStringLiteralDfa4_0(active0, 0x100c8040L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa4_0(active0, 0x400000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x40000000L);
+      case 76:
+      case 108:
+         return jjMoveStringLiteralDfa4_0(active0, 0x20000L);
+      case 77:
+      case 109:
+         if ((active0 & 0x1000000L) != 0L)
+            return jjStartNfaWithStates_0(3, 24, 0);
+         return jjMoveStringLiteralDfa4_0(active0, 0x400000000000L);
+      case 78:
+      case 110:
+         return jjMoveStringLiteralDfa4_0(active0, 0x41000000000000L);
+      case 79:
+      case 111:
+         if ((active0 & 0x10000L) != 0L)
+            return jjStartNfaWithStates_0(3, 16, 0);
+         return jjMoveStringLiteralDfa4_0(active0, 0x2a00000000000L);
       case 80:
       case 112:
          if ((active0 & 0x20L) != 0L)
-            return jjStartNfaWithStates_0(3, 5, 13);
-         else if ((active0 & 0x400L) != 0L)
-            return jjStartNfaWithStates_0(3, 10, 13);
-         break;
+            return jjStartNfaWithStates_0(3, 5, 0);
+         else if ((active0 & 0x1000L) != 0L)
+            return jjStartNfaWithStates_0(3, 12, 0);
+         return jjMoveStringLiteralDfa4_0(active0, 0x40000000000L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa4_0(active0, 0x200000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0xc00000L);
       case 84:
       case 116:
-         if ((active0 & 0x1000L) != 0L)
-            return jjStartNfaWithStates_0(3, 12, 13);
-         break;
+         if ((active0 & 0x4000L) != 0L)
+            return jjStartNfaWithStates_0(3, 14, 0);
+         return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa4_0(active0, 0x1a0000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0xc000000L);
       case 87:
       case 119:
-         if ((active0 & 0x80L) != 0L)
-            return jjStartNfaWithStates_0(3, 7, 13);
+         if ((active0 & 0x100L) != 0L)
+            return jjStartNfaWithStates_0(3, 8, 0);
          break;
       default :
          break;
@@ -403,27 +543,60 @@
    }
    switch(curChar)
    {
+      case 66:
+      case 98:
+         return jjMoveStringLiteralDfa5_0(active0, 0x200000L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa5_0(active0, 0x8000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x80000L);
       case 69:
       case 101:
-         if ((active0 & 0x200000L) != 0L)
-            return jjStartNfaWithStates_0(4, 21, 13);
-         return jjMoveStringLiteralDfa5_0(active0, 0x80000L);
+         if ((active0 & 0x20000L) != 0L)
+            return jjStartNfaWithStates_0(4, 17, 0);
+         else if ((active0 & 0x800000L) != 0L)
+            return jjStartNfaWithStates_0(4, 23, 0);
+         return jjMoveStringLiteralDfa5_0(active0, 0x10400004000000L);
+      case 71:
+      case 103:
+         return jjMoveStringLiteralDfa5_0(active0, 0x40000000000000L);
+      case 72:
+      case 104:
+         return jjMoveStringLiteralDfa5_0(active0, 0x8000000000000L);
+      case 75:
+      case 107:
+         if ((active0 & 0x100000000000L) != 0L)
+            return jjStartNfaWithStates_0(4, 44, 0);
+         break;
+      case 76:
+      case 108:
+         return jjMoveStringLiteralDfa5_0(active0, 0x20000100000L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa5_0(active0, 0x120000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x800008000000L);
+      case 79:
+      case 111:
+         return jjMoveStringLiteralDfa5_0(active0, 0x4000000000000L);
       case 82:
       case 114:
          if ((active0 & 0x40L) != 0L)
-            return jjStartNfaWithStates_0(4, 6, 13);
-         return jjMoveStringLiteralDfa5_0(active0, 0x2100L);
+            return jjStartNfaWithStates_0(4, 6, 0);
+         else if ((active0 & 0x80L) != 0L)
+            return jjStartNfaWithStates_0(4, 7, 0);
+         return jjMoveStringLiteralDfa5_0(active0, 0x240000008200L);
+      case 83:
+      case 115:
+         return jjMoveStringLiteralDfa5_0(active0, 0x10000000L);
       case 84:
       case 116:
-         if ((active0 & 0x400000L) != 0L)
-            return jjStartNfaWithStates_0(4, 22, 13);
-         return jjMoveStringLiteralDfa5_0(active0, 0x4200L);
+         if ((active0 & 0x40000000L) != 0L)
+            return jjStartNfaWithStates_0(4, 30, 0);
+         return jjMoveStringLiteralDfa5_0(active0, 0x1000000440800L);
+      case 85:
+      case 117:
+         return jjMoveStringLiteralDfa5_0(active0, 0x2000000000000L);
+      case 86:
+      case 118:
+         return jjMoveStringLiteralDfa5_0(active0, 0x10020000000L);
       default :
          break;
    }
@@ -440,36 +613,58 @@
    }
    switch(curChar)
    {
+      case 65:
+      case 97:
+         return jjMoveStringLiteralDfa6_0(active0, 0x8000000000000L);
+      case 67:
+      case 99:
+         return jjMoveStringLiteralDfa6_0(active0, 0x2000000000000L);
+      case 68:
+      case 100:
+         if ((active0 & 0x200000000000L) != 0L)
+            return jjStartNfaWithStates_0(5, 45, 0);
+         break;
       case 69:
       case 101:
-         if ((active0 & 0x200L) != 0L)
-            return jjStartNfaWithStates_0(5, 9, 13);
-         else if ((active0 & 0x4000L) != 0L)
-            return jjStartNfaWithStates_0(5, 14, 13);
-         break;
+         if ((active0 & 0x800L) != 0L)
+            return jjStartNfaWithStates_0(5, 11, 0);
+         else if ((active0 & 0x40000L) != 0L)
+            return jjStartNfaWithStates_0(5, 18, 0);
+         else if ((active0 & 0x100000L) != 0L)
+            return jjStartNfaWithStates_0(5, 20, 0);
+         else if ((active0 & 0x40000000000000L) != 0L)
+            return jjStartNfaWithStates_0(5, 54, 0);
+         return jjMoveStringLiteralDfa6_0(active0, 0x70020000000L);
+      case 70:
+      case 102:
+         return jjMoveStringLiteralDfa6_0(active0, 0x800000000000L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa6_0(active0, 0x100L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x1000000400200L);
+      case 76:
+      case 108:
+         return jjMoveStringLiteralDfa6_0(active0, 0x200000L);
+      case 77:
+      case 109:
+         return jjMoveStringLiteralDfa6_0(active0, 0x400000000000L);
       case 78:
       case 110:
-         if ((active0 & 0x20000L) != 0L)
-         {
-            jjmatchedKind = 17;
-            jjmatchedPos = 5;
-         }
-         return jjMoveStringLiteralDfa6_0(active0, 0x100000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x10000008000000L);
+      case 82:
+      case 114:
+         return jjMoveStringLiteralDfa6_0(active0, 0x4000000000000L);
       case 83:
       case 115:
-         if ((active0 & 0x80000L) != 0L)
-            return jjStartNfaWithStates_0(5, 19, 13);
+         if ((active0 & 0x4000000L) != 0L)
+            return jjStartNfaWithStates_0(5, 26, 0);
          break;
       case 84:
       case 116:
-         if ((active0 & 0x2000L) != 0L)
-            return jjStartNfaWithStates_0(5, 13, 13);
-         else if ((active0 & 0x8000L) != 0L)
-            return jjStartNfaWithStates_0(5, 15, 13);
-         break;
+         if ((active0 & 0x8000L) != 0L)
+            return jjStartNfaWithStates_0(5, 15, 0);
+         else if ((active0 & 0x80000L) != 0L)
+            return jjStartNfaWithStates_0(5, 19, 0);
+         return jjMoveStringLiteralDfa6_0(active0, 0x10000000L);
       default :
          break;
    }
@@ -486,12 +681,43 @@
    }
    switch(curChar)
    {
+      case 95:
+         return jjMoveStringLiteralDfa7_0(active0, 0x4000000000000L);
+      case 65:
+      case 97:
+         return jjMoveStringLiteralDfa7_0(active0, 0x10000000L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa7_0(active0, 0x100L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x200L);
+      case 69:
+      case 101:
+         if ((active0 & 0x200000L) != 0L)
+            return jjStartNfaWithStates_0(6, 21, 0);
+         break;
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa7_0(active0, 0x100000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x8000000L);
+      case 72:
+      case 104:
+         return jjMoveStringLiteralDfa7_0(active0, 0x2000000000000L);
+      case 73:
+      case 105:
+         return jjMoveStringLiteralDfa7_0(active0, 0x800000000000L);
+      case 78:
+      case 110:
+         return jjMoveStringLiteralDfa7_0(active0, 0x1020000400000L);
+      case 79:
+      case 111:
+         return jjMoveStringLiteralDfa7_0(active0, 0x400000000000L);
+      case 82:
+      case 114:
+         return jjMoveStringLiteralDfa7_0(active0, 0x10020000000L);
+      case 83:
+      case 115:
+         return jjMoveStringLiteralDfa7_0(active0, 0x8040000000000L);
+      case 84:
+      case 116:
+         return jjMoveStringLiteralDfa7_0(active0, 0x10000000000000L);
       default :
          break;
    }
@@ -510,12 +736,34 @@
    {
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa8_0(active0, 0x100000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x8000000L);
       case 69:
       case 101:
-         if ((active0 & 0x100L) != 0L)
-            return jjStartNfaWithStates_0(7, 8, 13);
+         if ((active0 & 0x200L) != 0L)
+            return jjStartNfaWithStates_0(7, 9, 0);
+         return jjMoveStringLiteralDfa8_0(active0, 0x2000000000000L);
+      case 71:
+      case 103:
+         if ((active0 & 0x400000L) != 0L)
+            return jjStartNfaWithStates_0(7, 22, 0);
+         return jjMoveStringLiteralDfa8_0(active0, 0x1020000000000L);
+      case 72:
+      case 104:
+         if ((active0 & 0x8000000000000L) != 0L)
+            return jjStartNfaWithStates_0(7, 51, 0);
          break;
+      case 76:
+      case 108:
+         return jjMoveStringLiteralDfa8_0(active0, 0x800000000000L);
+      case 77:
+      case 109:
+         return jjMoveStringLiteralDfa8_0(active0, 0x10000000L);
+      case 82:
+      case 114:
+         return jjMoveStringLiteralDfa8_0(active0, 0x10400000000000L);
+      case 83:
+      case 115:
+         return jjMoveStringLiteralDfa8_0(active0, 0x4050020000000L);
       default :
          break;
    }
@@ -532,9 +780,30 @@
    }
    switch(curChar)
    {
+      case 95:
+         return jjMoveStringLiteralDfa9_0(active0, 0x1000000000000L);
+      case 68:
+      case 100:
+         return jjMoveStringLiteralDfa9_0(active0, 0x2000000000000L);
+      case 73:
+      case 105:
+         return jjMoveStringLiteralDfa9_0(active0, 0x14050020000000L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa9_0(active0, 0x100000L);
+         return jjMoveStringLiteralDfa9_0(active0, 0x8000000L);
+      case 80:
+      case 112:
+         if ((active0 & 0x10000000L) != 0L)
+            return jjStartNfaWithStates_0(8, 28, 0);
+         break;
+      case 84:
+      case 116:
+         return jjMoveStringLiteralDfa9_0(active0, 0x820000000000L);
+      case 89:
+      case 121:
+         if ((active0 & 0x400000000000L) != 0L)
+            return jjStartNfaWithStates_0(8, 46, 0);
+         break;
       default :
          break;
    }
@@ -551,9 +820,28 @@
    }
    switch(curChar)
    {
+      case 95:
+         return jjMoveStringLiteralDfa10_0(active0, 0x2000000000000L);
+      case 66:
+      case 98:
+         return jjMoveStringLiteralDfa10_0(active0, 0x1000000000000L);
+      case 69:
+      case 101:
+         return jjMoveStringLiteralDfa10_0(active0, 0x10800000000000L);
+      case 72:
+      case 104:
+         if ((active0 & 0x20000000000L) != 0L)
+            return jjStartNfaWithStates_0(9, 41, 0);
+         break;
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa10_0(active0, 0x100000L);
+         return jjMoveStringLiteralDfa10_0(active0, 0x8000000L);
+      case 79:
+      case 111:
+         return jjMoveStringLiteralDfa10_0(active0, 0x50020000000L);
+      case 90:
+      case 122:
+         return jjMoveStringLiteralDfa10_0(active0, 0x4000000000000L);
       default :
          break;
    }
@@ -570,9 +858,32 @@
    }
    switch(curChar)
    {
+      case 66:
+      case 98:
+         return jjMoveStringLiteralDfa11_0(active0, 0x2000000000000L);
+      case 69:
+      case 101:
+         if ((active0 & 0x4000000000000L) != 0L)
+            return jjStartNfaWithStates_0(10, 50, 0);
+         break;
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa11_0(active0, 0x100000L);
+         return jjMoveStringLiteralDfa11_0(active0, 0x1000008000000L);
+      case 78:
+      case 110:
+         if ((active0 & 0x40000000000L) != 0L)
+            return jjStartNfaWithStates_0(10, 42, 0);
+         return jjMoveStringLiteralDfa11_0(active0, 0x10020000000L);
+      case 82:
+      case 114:
+         if ((active0 & 0x800000000000L) != 0L)
+            return jjStartNfaWithStates_0(10, 47, 0);
+         break;
+      case 83:
+      case 115:
+         if ((active0 & 0x10000000000000L) != 0L)
+            return jjStartNfaWithStates_0(10, 52, 0);
+         break;
       default :
          break;
    }
@@ -591,7 +902,20 @@
    {
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa12_0(active0, 0x100000L);
+         return jjMoveStringLiteralDfa12_0(active0, 0x8000000L);
+      case 76:
+      case 108:
+         return jjMoveStringLiteralDfa12_0(active0, 0x2000000000000L);
+      case 79:
+      case 111:
+         return jjMoveStringLiteralDfa12_0(active0, 0x1000000000000L);
+      case 83:
+      case 115:
+         if ((active0 & 0x20000000L) != 0L)
+            return jjStartNfaWithStates_0(11, 29, 0);
+         else if ((active0 & 0x10000000000L) != 0L)
+            return jjStartNfaWithStates_0(11, 40, 0);
+         break;
       default :
          break;
    }
@@ -610,7 +934,10 @@
    {
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa13_0(active0, 0x100000L);
+         return jjMoveStringLiteralDfa13_0(active0, 0x8000000L);
+      case 79:
+      case 111:
+         return jjMoveStringLiteralDfa13_0(active0, 0x3000000000000L);
       default :
          break;
    }
@@ -627,16 +954,177 @@
    }
    switch(curChar)
    {
+      case 77:
+      case 109:
+         return jjMoveStringLiteralDfa14_0(active0, 0x1000000000000L);
+      case 79:
+      case 111:
+         return jjMoveStringLiteralDfa14_0(active0, 0x2000000000000L);
       case 83:
       case 115:
-         if ((active0 & 0x100000L) != 0L)
-            return jjStartNfaWithStates_0(13, 20, 13);
+         if ((active0 & 0x8000000L) != 0L)
+            return jjStartNfaWithStates_0(13, 27, 0);
          break;
       default :
          break;
    }
    return jjStartNfa_0(12, active0);
 }
+private final int jjMoveStringLiteralDfa14_0(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return jjStartNfa_0(12, old0); 
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(13, active0);
+      return 14;
+   }
+   switch(curChar)
+   {
+      case 70:
+      case 102:
+         return jjMoveStringLiteralDfa15_0(active0, 0x1000000000000L);
+      case 77:
+      case 109:
+         return jjMoveStringLiteralDfa15_0(active0, 0x2000000000000L);
+      default :
+         break;
+   }
+   return jjStartNfa_0(13, active0);
+}
+private final int jjMoveStringLiteralDfa15_0(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return jjStartNfa_0(13, old0); 
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(14, active0);
+      return 15;
+   }
+   switch(curChar)
+   {
+      case 70:
+      case 102:
+         return jjMoveStringLiteralDfa16_0(active0, 0x2000000000000L);
+      case 73:
+      case 105:
+         return jjMoveStringLiteralDfa16_0(active0, 0x1000000000000L);
+      default :
+         break;
+   }
+   return jjStartNfa_0(14, active0);
+}
+private final int jjMoveStringLiteralDfa16_0(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return jjStartNfa_0(14, old0); 
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(15, active0);
+      return 16;
+   }
+   switch(curChar)
+   {
+      case 73:
+      case 105:
+         return jjMoveStringLiteralDfa17_0(active0, 0x2000000000000L);
+      case 76:
+      case 108:
+         return jjMoveStringLiteralDfa17_0(active0, 0x1000000000000L);
+      default :
+         break;
+   }
+   return jjStartNfa_0(15, active0);
+}
+private final int jjMoveStringLiteralDfa17_0(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return jjStartNfa_0(15, old0); 
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(16, active0);
+      return 17;
+   }
+   switch(curChar)
+   {
+      case 76:
+      case 108:
+         return jjMoveStringLiteralDfa18_0(active0, 0x2000000000000L);
+      case 84:
+      case 116:
+         return jjMoveStringLiteralDfa18_0(active0, 0x1000000000000L);
+      default :
+         break;
+   }
+   return jjStartNfa_0(16, active0);
+}
+private final int jjMoveStringLiteralDfa18_0(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return jjStartNfa_0(16, old0); 
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(17, active0);
+      return 18;
+   }
+   switch(curChar)
+   {
+      case 69:
+      case 101:
+         return jjMoveStringLiteralDfa19_0(active0, 0x1000000000000L);
+      case 84:
+      case 116:
+         return jjMoveStringLiteralDfa19_0(active0, 0x2000000000000L);
+      default :
+         break;
+   }
+   return jjStartNfa_0(17, active0);
+}
+private final int jjMoveStringLiteralDfa19_0(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return jjStartNfa_0(17, old0); 
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(18, active0);
+      return 19;
+   }
+   switch(curChar)
+   {
+      case 69:
+      case 101:
+         return jjMoveStringLiteralDfa20_0(active0, 0x2000000000000L);
+      case 82:
+      case 114:
+         if ((active0 & 0x1000000000000L) != 0L)
+            return jjStartNfaWithStates_0(19, 48, 0);
+         break;
+      default :
+         break;
+   }
+   return jjStartNfa_0(18, active0);
+}
+private final int jjMoveStringLiteralDfa20_0(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return jjStartNfa_0(18, old0); 
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(19, active0);
+      return 20;
+   }
+   switch(curChar)
+   {
+      case 82:
+      case 114:
+         if ((active0 & 0x2000000000000L) != 0L)
+            return jjStartNfaWithStates_0(20, 49, 0);
+         break;
+      default :
+         break;
+   }
+   return jjStartNfa_0(19, active0);
+}
 private final void jjCheckNAdd(int state)
 {
    if (jjrounds[state] != jjround)
@@ -674,7 +1162,7 @@
 {
    int[] nextStates;
    int startsAt = 0;
-   jjnewStateCnt = 13;
+   jjnewStateCnt = 31;
    int i = 1;
    jjstateSet[0] = startState;
    int j, kind = 0x7fffffff;
@@ -689,100 +1177,173 @@
          {
             switch(jjstateSet[--i])
             {
-               case 0:
+               case 31:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 34)
-                        kind = 34;
-                     jjCheckNAdd(3);
-                  }
-                  else if ((0xe00000000000L & l) != 0L)
-                  {
-                     if (kind > 32)
-                        kind = 32;
-                     jjCheckNAdd(1);
+                     if (kind > 57)
+                        kind = 57;
+                     jjCheckNAddTwoStates(2, 3);
                   }
-                  else if (curChar == 39)
-                     jjCheckNAddStates(0, 2);
-                  else if (curChar == 34)
-                     jjCheckNAdd(5);
-                  if ((0x3ff000000000000L & l) != 0L)
+                  else if ((0x400e00000000000L & l) != 0L)
                   {
-                     if (kind > 33)
-                        kind = 33;
-                     jjCheckNAdd(2);
+                     if (kind > 55)
+                        kind = 55;
+                     jjCheckNAdd(0);
                   }
                   break;
-               case 13:
-                  if ((0x3ffe00000000000L & l) != 0L)
+               case 1:
+                  if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 32)
-                        kind = 32;
-                     jjCheckNAdd(1);
+                     if (kind > 56)
+                        kind = 56;
+                     jjCheckNAddStates(0, 6);
                   }
-                  if ((0x3ff000000000000L & l) != 0L)
+                  else if ((0x400e00000000000L & l) != 0L)
                   {
-                     if (kind > 34)
-                        kind = 34;
-                     jjCheckNAdd(3);
+                     if (kind > 55)
+                        kind = 55;
+                     jjCheckNAdd(0);
                   }
+                  else if (curChar == 39)
+                     jjCheckNAddStates(7, 9);
+                  else if (curChar == 34)
+                     jjCheckNAdd(7);
+                  if (curChar == 46)
+                     jjCheckNAdd(2);
                   break;
-               case 1:
-                  if ((0x3ffe00000000000L & l) == 0L)
+               case 0:
+                  if ((0x400e00000000000L & l) == 0L)
                      break;
-                  if (kind > 32)
-                     kind = 32;
-                  jjCheckNAdd(1);
+                  if (kind > 55)
+                     kind = 55;
+                  jjCheckNAdd(0);
                   break;
                case 2:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 33)
-                     kind = 33;
-                  jjCheckNAdd(2);
-                  break;
-               case 3:
-                  if ((0x3ff000000000000L & l) == 0L)
-                     break;
-                  if (kind > 34)
-                     kind = 34;
-                  jjCheckNAdd(3);
+                  if (kind > 57)
+                     kind = 57;
+                  jjCheckNAddTwoStates(2, 3);
                   break;
                case 4:
-                  if (curChar == 34)
+                  if ((0x280000000000L & l) != 0L)
                      jjCheckNAdd(5);
                   break;
                case 5:
-                  if ((0xfffffffbffffffffL & l) != 0L)
-                     jjCheckNAddTwoStates(5, 6);
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 57)
+                     kind = 57;
+                  jjCheckNAdd(5);
                   break;
                case 6:
-                  if (curChar == 34 && kind > 35)
-                     kind = 35;
+                  if (curChar == 34)
+                     jjCheckNAdd(7);
                   break;
                case 7:
-                  if (curChar == 39)
-                     jjCheckNAddStates(0, 2);
+                  if ((0xfffffffbffffffffL & l) != 0L)
+                     jjCheckNAddTwoStates(7, 8);
                   break;
                case 8:
-                  if ((0xffffff7fffffffffL & l) != 0L)
-                     jjCheckNAddStates(0, 2);
+                  if (curChar == 34 && kind > 59)
+                     kind = 59;
                   break;
                case 9:
                   if (curChar == 39)
-                     jjCheckNAddStates(3, 5);
+                     jjCheckNAddStates(7, 9);
                   break;
                case 10:
-                  if (curChar == 39)
-                     jjstateSet[jjnewStateCnt++] = 9;
+                  if ((0xffffff7fffffffffL & l) != 0L)
+                     jjCheckNAddStates(7, 9);
                   break;
                case 11:
-                  if ((0xffffff7fffffffffL & l) != 0L)
-                     jjCheckNAddStates(3, 5);
+                  if (curChar == 39)
+                     jjCheckNAddStates(10, 12);
                   break;
                case 12:
-                  if (curChar == 39 && kind > 36)
-                     kind = 36;
+                  if (curChar == 39)
+                     jjstateSet[jjnewStateCnt++] = 11;
+                  break;
+               case 13:
+                  if ((0xffffff7fffffffffL & l) != 0L)
+                     jjCheckNAddStates(10, 12);
+                  break;
+               case 14:
+                  if (curChar == 39 && kind > 60)
+                     kind = 60;
+                  break;
+               case 15:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 56)
+                     kind = 56;
+                  jjCheckNAddStates(0, 6);
+                  break;
+               case 16:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 56)
+                     kind = 56;
+                  jjCheckNAdd(16);
+                  break;
+               case 17:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAddTwoStates(17, 18);
+                  break;
+               case 18:
+                  if (curChar == 46)
+                     jjCheckNAdd(19);
+                  break;
+               case 19:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 57)
+                     kind = 57;
+                  jjCheckNAddTwoStates(19, 20);
+                  break;
+               case 21:
+                  if ((0x280000000000L & l) != 0L)
+                     jjCheckNAdd(22);
+                  break;
+               case 22:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 57)
+                     kind = 57;
+                  jjCheckNAdd(22);
+                  break;
+               case 23:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAddTwoStates(23, 24);
+                  break;
+               case 25:
+                  if ((0x280000000000L & l) != 0L)
+                     jjCheckNAdd(26);
+                  break;
+               case 26:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 57)
+                     kind = 57;
+                  jjCheckNAdd(26);
+                  break;
+               case 27:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 57)
+                     kind = 57;
+                  jjCheckNAddTwoStates(27, 28);
+                  break;
+               case 29:
+                  if ((0x280000000000L & l) != 0L)
+                     jjCheckNAdd(30);
+                  break;
+               case 30:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 57)
+                     kind = 57;
+                  jjCheckNAdd(30);
                   break;
                default : break;
             }
@@ -795,56 +1356,45 @@
          {
             switch(jjstateSet[--i])
             {
+               case 31:
                case 0:
-                  if ((0x7fffffe87fffffeL & l) != 0L)
-                  {
-                     if (kind > 32)
-                        kind = 32;
-                     jjCheckNAdd(1);
-                  }
-                  if ((0x7fffffe07fffffeL & l) != 0L)
-                  {
-                     if (kind > 34)
-                        kind = 34;
-                     jjCheckNAdd(3);
-                  }
-                  break;
-               case 13:
-                  if ((0x7fffffe87fffffeL & l) != 0L)
-                  {
-                     if (kind > 32)
-                        kind = 32;
-                     jjCheckNAdd(1);
-                  }
-                  if ((0x7fffffe07fffffeL & l) != 0L)
-                  {
-                     if (kind > 34)
-                        kind = 34;
-                     jjCheckNAdd(3);
-                  }
+                  if ((0x7fffffe87fffffeL & l) == 0L)
+                     break;
+                  if (kind > 55)
+                     kind = 55;
+                  jjCheckNAdd(0);
                   break;
                case 1:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 32)
-                     kind = 32;
-                  jjCheckNAdd(1);
+                  if (kind > 55)
+                     kind = 55;
+                  jjCheckNAdd(0);
                   break;
                case 3:
-                  if ((0x7fffffe07fffffeL & l) == 0L)
-                     break;
-                  if (kind > 34)
-                     kind = 34;
-                  jjCheckNAdd(3);
+                  if ((0x2000000020L & l) != 0L)
+                     jjAddStates(13, 14);
                   break;
-               case 5:
-                  jjAddStates(6, 7);
+               case 7:
+                  jjAddStates(15, 16);
                   break;
-               case 8:
-                  jjCheckNAddStates(0, 2);
+               case 10:
+                  jjCheckNAddStates(7, 9);
                   break;
-               case 11:
-                  jjCheckNAddStates(3, 5);
+               case 13:
+                  jjCheckNAddStates(10, 12);
+                  break;
+               case 20:
+                  if ((0x2000000020L & l) != 0L)
+                     jjAddStates(17, 18);
+                  break;
+               case 24:
+                  if ((0x2000000020L & l) != 0L)
+                     jjAddStates(19, 20);
+                  break;
+               case 28:
+                  if ((0x2000000020L & l) != 0L)
+                     jjAddStates(21, 22);
                   break;
                default : break;
             }
@@ -858,17 +1408,17 @@
          {
             switch(jjstateSet[--i])
             {
-               case 5:
+               case 7:
                   if ((jjbitVec0[i2] & l2) != 0L)
-                     jjAddStates(6, 7);
+                     jjAddStates(15, 16);
                   break;
-               case 8:
+               case 10:
                   if ((jjbitVec0[i2] & l2) != 0L)
-                     jjCheckNAddStates(0, 2);
+                     jjCheckNAddStates(7, 9);
                   break;
-               case 11:
+               case 13:
                   if ((jjbitVec0[i2] & l2) != 0L)
-                     jjCheckNAddStates(3, 5);
+                     jjCheckNAddStates(10, 12);
                   break;
                default : break;
             }
@@ -881,31 +1431,34 @@
          kind = 0x7fffffff;
       }
       ++curPos;
-      if ((i = jjnewStateCnt) == (startsAt = 13 - (jjnewStateCnt = startsAt)))
+      if ((i = jjnewStateCnt) == (startsAt = 31 - (jjnewStateCnt = startsAt)))
          return curPos;
       try { curChar = input_stream.readChar(); }
       catch(java.io.IOException e) { return curPos; }
    }
 }
 static final int[] jjnextStates = {
-   8, 10, 12, 10, 11, 12, 5, 6, 
+   16, 17, 18, 23, 24, 27, 28, 10, 12, 14, 12, 13, 14, 4, 5, 7, 
+   8, 21, 22, 25, 26, 29, 30, 
 };
 public static final String[] jjstrLiteralImages = {
 "", null, null, null, null, null, null, null, null, null, null, null, null, 
-null, null, null, null, null, null, null, null, null, null, null, null, "\54", 
-"\56", "\50", "\51", "\75", "\74\76", "\55", null, null, null, null, null, "\73", };
+null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
+null, null, null, null, null, null, "\54", "\56", "\50", "\51", "\75", "\74\76", 
+"\52", null, null, null, null, null, null, null, null, null, null, null, null, null, 
+null, null, null, null, null, null, null, null, "\73", };
 public static final String[] lexStateNames = {
    "DEFAULT", 
 };
 static final long[] jjtoToken = {
-   0x3fffffffe1L, 
+   0x3bffffffffffffe1L, 
 };
 static final long[] jjtoSkip = {
    0x1eL, 
 };
 protected SimpleCharStream input_stream;
-private final int[] jjrounds = new int[13];
-private final int[] jjstateSet = new int[26];
+private final int[] jjrounds = new int[31];
+private final int[] jjstateSet = new int[62];
 protected char curChar;
 public ParserTokenManager(SimpleCharStream stream){
    if (SimpleCharStream.staticFlag)
@@ -927,7 +1480,7 @@
 {
    int i;
    jjround = 0x80000001;
-   for (i = 13; i-- > 0;)
+   for (i = 31; i-- > 0;)
       jjrounds[i] = 0x80000000;
 }
 public void ReInit(SimpleCharStream stream, int lexState)

Modified: lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestToString.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestToString.java?rev=575156&r1=575155&r2=575156&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestToString.java (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestToString.java Wed Sep 12 21:01:05 2007
@@ -47,23 +47,23 @@
     HTableDescriptor htd = new HTableDescriptor("hank");
     htd.addFamily(new HColumnDescriptor("hankfamily:"));
     htd.addFamily(new HColumnDescriptor(new Text("hankotherfamily:"), 10,
-        HColumnDescriptor.CompressionType.BLOCK, true, 1000, null));
+      HColumnDescriptor.CompressionType.BLOCK, true, 1000, null));
     System. out.println(htd.toString());
-    assertEquals("Table descriptor", "name: hank, families: "
-        + "{hankfamily:=(hankfamily:, max versions: 3, compression: NONE, "
-        + "in memory: false, max value length: 2147483647, bloom filter: none), "
-        + "hankotherfamily:=(hankotherfamily:, max versions: 10, "
-        + "compression: BLOCK, in memory: true, max value length: 1000, "
-        + "bloom filter: none)}", htd.toString());
+    assertEquals("Table descriptor", "name: hank, families: " +
+      "{hankfamily:={name: hankfamily, max versions: 3, compression: NONE, " +
+      "in memory: false, max length: 2147483647, bloom filter: none}, " +
+      "hankotherfamily:={name: hankotherfamily, max versions: 10, " +
+      "compression: BLOCK, in memory: true, max length: 1000, " +
+      "bloom filter: none}}", htd.toString());
     HRegionInfo hri = new HRegionInfo(-1, htd, new Text(), new Text("10"));
     System.out.println(hri.toString());
     assertEquals("HRegionInfo", 
-        "regionname: hank,,-1, startKey: <>, tableDesc: {" + "name: hank, "
-        + "families: {hankfamily:=(hankfamily:, max versions: 3, "
-        + "compression: NONE, in memory: false, max value length: 2147483647, "
-        + "bloom filter: none), hankotherfamily:=(hankotherfamily:, "
-        + "max versions: 10, compression: BLOCK, in memory: true, max value "
-        + "length: 1000, bloom filter: none)}}",
-        hri.toString());
+      "regionname: hank,,-1, startKey: <>, tableDesc: {name: hank, " +
+      "families: {hankfamily:={name: hankfamily, max versions: 3, " +
+      "compression: NONE, in memory: false, max length: 2147483647, " +
+      "bloom filter: none}, hankotherfamily:={name: hankotherfamily, " +
+      "max versions: 10, compression: BLOCK, in memory: true, " +
+      "max length: 1000, bloom filter: none}}}",
+      hri.toString());
   }
 }

Added: lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/shell/TestConsoleTable.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/shell/TestConsoleTable.java?rev=575156&view=auto
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/shell/TestConsoleTable.java (added)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/shell/TestConsoleTable.java Wed Sep 12 21:01:05 2007
@@ -0,0 +1,41 @@
+/**
+ * Copyright 2007 The Apache Software Foundation
+ *
+ * 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.hadoop.hbase.shell;
+
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+/**
+ * Test the console table class
+ * TODO: Console table needs fixing.
+ */
+public class TestConsoleTable extends TestCase {
+  public void testPrintLine() {
+    ConsoleTable.printLine(0, "smallkey", "smallcolumn", "smallcelldata");
+    ConsoleTable.printLine(0, "a large key too big for column", "smallcolumn",
+      "smallcelldata");
+    ConsoleTable.printLine(0, "smallkey", "smallcolumn", "smallcelldata");
+  }
+  
+  public static void main(String[] args) {
+    TestRunner.run(new TestSuite(TestConsoleTable.class));
+  }
+}

Modified: lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/shell/TestHBaseShell.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/shell/TestHBaseShell.java?rev=575156&r1=575155&r2=575156&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/shell/TestHBaseShell.java (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/shell/TestHBaseShell.java Wed Sep 12 21:01:05 2007
@@ -19,19 +19,149 @@
  */
 package org.apache.hadoop.hbase.shell;
 
-import junit.framework.TestCase;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hbase.HBaseAdmin;
+import org.apache.hadoop.hbase.HBaseClusterTestCase;
+import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.HTableDescriptor;
+import org.apache.hadoop.hbase.shell.generated.ParseException;
 import org.apache.hadoop.hbase.shell.generated.Parser;
+import org.apache.hadoop.io.Text;
 
 /**
- * Tests for HBase shell
+ * Tests for Hbase shell
  */
-public class TestHBaseShell extends TestCase {
-  /** test parsing */
-  public void testParse() {
-    String queryString1 = "SELECT test_table WHERE row='row_key' and " +
-      "column='column_key';";
-    new Parser(queryString1);
-    
+public class TestHBaseShell extends HBaseClusterTestCase {
+  
+  protected final Log LOG = LogFactory.getLog(this.getClass().getName());
+  private ByteArrayOutputStream baos;
+  private HBaseAdmin admin;
+  
+  public TestHBaseShell() {
+    super(1 /*One region server only*/);
   }
-}
+  
+  @Override
+  public void setUp() throws Exception {
+    super.setUp();
+    // Capture System.out so we can grep for stuff in it.  Have to do it once
+    // only because ConsoleTable sets up STDOUT in a static initialization
+    this.baos = new ByteArrayOutputStream();
+    System.setOut(new PrintStream(this.baos));
+    this.admin = new HBaseAdmin(this.conf);
+  }
+
+  /**
+   * Create and then drop a table.
+   * Tests also that I can use single or double quotes around table and 
+   * column family names.
+   * @throws Exception
+   */
+  public void testCreateDeleteTable() throws Exception {
+    final String tableName = getName();
+    final String columnFamily = tableName;
+    // Create table
+    createTable("create table " + tableName + " (" + columnFamily + ");",
+      tableName, columnFamily);
+    // Try describe
+    runCommand("describe " + tableName + ";");
+    // Try describe with single quotes
+    runCommand("describe '" + tableName + "';");
+    // Try describe with double-quotes
+    runCommand("describe \"" + tableName + "\";");
+    // Try dropping the table.
+    dropTable("drop table " + tableName + ";", tableName);
+    // Use double-quotes creating table.
+    final String dblQuoteSuffix = "DblQuote";
+    final String dblQuotedTableName = tableName + dblQuoteSuffix;
+    createTable("create table \"" + dblQuotedTableName + "\" (" +
+      columnFamily + ");", dblQuotedTableName, columnFamily);
+    // Use single-quotes creating table.
+    final String sglQuoteSuffix = "SglQuote";
+    final String snglQuotedTableName = tableName + sglQuoteSuffix;
+    createTable("create table '" + snglQuotedTableName + "' (" +
+      columnFamily + ");", snglQuotedTableName, columnFamily);
+    // Use double-quotes around columnfamily name.
+    final String dblQuotedColumnFamily = columnFamily + dblQuoteSuffix;
+    String tmpTableName = tableName + dblQuotedColumnFamily;
+    createTable("create table " + tmpTableName + " (\"" +
+      dblQuotedColumnFamily + "\");", tmpTableName,
+      dblQuotedColumnFamily);
+    // Use single-quotes around columnfamily name.
+    final String sglQuotedColumnFamily = columnFamily + sglQuoteSuffix;
+    tmpTableName = tableName + sglQuotedColumnFamily;
+    createTable("create table " + tmpTableName + " ('" +
+        sglQuotedColumnFamily + "');", tmpTableName, sglQuotedColumnFamily);
+  }
+
+  public void testInsertSelectDelete() throws Exception {
+    final String tableName = getName();
+    final String columnFamily = tableName;
+    createTable("create table " + tableName + " (" + columnFamily + ");",
+      tableName, columnFamily);
+    // TODO: Add asserts that inserts, selects and deletes worked.
+    runCommand("insert into " + tableName + " (" + columnFamily +
+      ") values ('" + columnFamily + "') where row='" + columnFamily + "';");
+    // Insert with double-quotes on row.
+    runCommand("insert into " + tableName + " (" + columnFamily +
+      ") values ('" + columnFamily + "') where row=\"" + columnFamily + "\";");
+    // Insert with double-quotes on row and value.
+    runCommand("insert into " + tableName + " (" + columnFamily +
+      ") values (\"" + columnFamily + "\") where row=\"" + columnFamily +
+      "\";");
+    runCommand("select \"" + columnFamily + "\" from \"" + tableName +
+      "\" where row=\"" + columnFamily + "\";");
+    runCommand("delete \"" + columnFamily + ":\" from \"" + tableName +
+        "\" where row=\"" + columnFamily + "\";");
+  }
+  
+  private void createTable(final String cmdStr, final String tableName,
+    final String columnFamily)
+  throws ParseException, IOException {
+    // Run create command.
+    runCommand(cmdStr);
+    // Assert table was created.
+    assertTrue(this.admin.tableExists(new Text(tableName)));
+    HTableDescriptor [] tables = this.admin.listTables();
+    HTableDescriptor td = null;
+    for (int i = 0; i < tables.length; i++) {
+      if (tableName.equals(tables[i].getName().toString())) {
+        td = tables[i];
+      }
+    }
+    assertNotNull(td);
+    assertTrue(td.hasFamily(new Text(columnFamily + ":")));
+  }
+  
+  private void dropTable(final String cmdStr, final String tableName)
+  throws ParseException, IOException {
+    runCommand(cmdStr);
+    // Assert its gone
+    HTableDescriptor [] tables = this.admin.listTables();
+    for (int i = 0; i < tables.length; i++) {
+      assertNotSame(tableName, tables[i].getName().toString());
+    }
+  }
+  
+  private ReturnMsg runCommand(final String cmdStr)
+  throws ParseException, UnsupportedEncodingException {
+    LOG.info("Running command: " + cmdStr);
+    Parser parser = new Parser(cmdStr);
+    Command cmd = parser.terminatedCommand();
+    ReturnMsg rm = cmd.execute(this.conf);
+    dumpStdout();
+    return rm;
+  }
+  
+  private void dumpStdout() throws UnsupportedEncodingException {
+    LOG.info("STDOUT: " +
+      new String(this.baos.toByteArray(), HConstants.UTF8_ENCODING));
+    this.baos.reset();
+  }
+}
\ No newline at end of file



Mime
View raw message