Index: src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/HBaseShell.jj =================================================================== --- src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/HBaseShell.jj (revision 606712) +++ src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/HBaseShell.jj (working copy) @@ -79,6 +79,7 @@ | | | + | | | | @@ -181,6 +182,7 @@ | cmd = descCommand() | cmd = createCommand() | cmd = dropCommand() + | cmd = truncateCommand() | cmd = alterCommand() | cmd = insertCommand() | cmd = deleteCommand() @@ -325,7 +327,7 @@ { ( - n = Number() + n = number() { if(n < 0) { n = Integer.MAX_VALUE; @@ -334,7 +336,7 @@ } | - n = Number() + n = number() { columnSpec.put("MAX_LENGTH", n); } @@ -364,18 +366,18 @@ } | - n = Number() + n = number() { columnSpec.put("VECTOR_SIZE", n); } | - n = Number() + n = number() { columnSpec.put("NUM_HASH", n); } | - n = Number() + n = number() { columnSpec.put("NUM_ENTRIES", n); } @@ -491,6 +493,22 @@ } } +TruncateCommand truncateCommand() : +{ + TruncateCommand truncate = new TruncateCommand(this.out); + String tableName = null; +} +{ + + [ + tableName = identifier() + ] + { + truncate.setTableName(tableName); + return truncate; + } +} + InsertCommand insertCommand() : { InsertCommand in = new InsertCommand(this.out); @@ -595,13 +613,13 @@ ] [ - numVersion = Number() + numVersion = number() { select.setVersion(numVersion); } ] - [ limit = Number() { + [ limit = number() { try{ select.setLimit(limit); }catch(ClassCastException ce) { @@ -850,7 +868,7 @@ { return columnList; } } -int Number() : +int number() : { Token t = null; Token minusSignedInt = null; Index: src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserTokenManager.java =================================================================== --- src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserTokenManager.java (revision 606712) +++ src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserTokenManager.java (working copy) @@ -40,196 +40,196 @@ switch (pos) { case 0: - if ((active0 & 0xefffe603ffffffe0L) != 0L || (active1 & 0x1L) != 0L) + if ((active0 & 0x2000001000000000L) != 0L) + return 3; + if ((active0 & 0xdfffcc07ffffffe0L) != 0L || (active1 & 0x3L) != 0L) { - jjmatchedKind = 65; + jjmatchedKind = 66; return 1; } - if ((active0 & 0x1000000800000000L) != 0L) - return 3; return -1; case 1: - if ((active0 & 0xeff7e201fffcdfe0L) != 0L) + if ((active0 & 0x10080400064000L) != 0L || (active1 & 0x2L) != 0L) + return 1; + if ((active0 & 0xdfefc403fff9bfe0L) != 0L || (active1 & 0x1L) != 0L) { if (jjmatchedPos != 1) { - jjmatchedKind = 65; + jjmatchedKind = 66; jjmatchedPos = 1; } return 1; } - if ((active0 & 0x8040200032000L) != 0L || (active1 & 0x1L) != 0L) - return 1; return -1; case 2: - if ((active0 & 0xebffe000fbff9fe0L) != 0L) + if ((active0 & 0x800040208008000L) != 0L) + return 1; + if ((active0 & 0xd7ffc001f7ff3fe0L) != 0L || (active1 & 0x1L) != 0L) { - jjmatchedKind = 65; + jjmatchedKind = 66; jjmatchedPos = 2; return 1; } - if ((active0 & 0x400020104004000L) != 0L) - return 1; return -1; case 3: - if ((active0 & 0xabfee000f9fd08c0L) != 0L) + if ((active0 & 0x8002000004051720L) != 0L) + return 1; + if ((active0 & 0x57fdc001f3fa28c0L) != 0L || (active1 & 0x1L) != 0L) { if (jjmatchedPos != 3) { - jjmatchedKind = 65; + jjmatchedKind = 66; jjmatchedPos = 3; } return 1; } - if ((active0 & 0x4001000002029720L) != 0L) - return 1; return -1; case 4: - if ((active0 & 0x2bfce00078f90a00L) != 0L) + if ((active0 & 0x57f9c000f1f22a00L) != 0L) { - jjmatchedKind = 65; + jjmatchedKind = 66; jjmatchedPos = 4; return 1; } - if ((active0 & 0x80020000810400c0L) != 0L) + if ((active0 & 0x40001020800c0L) != 0L || (active1 & 0x1L) != 0L) return 1; return -1; case 5: - if ((active0 & 0x3f8e00070c00200L) != 0L) + if ((active0 & 0x7f1c000e1802200L) != 0L) { - jjmatchedKind = 65; + jjmatchedKind = 66; jjmatchedPos = 5; return 1; } - if ((active0 & 0x2804000008390800L) != 0L) + if ((active0 & 0x5008000010720800L) != 0L) return 1; return -1; case 6: - if ((active0 & 0x400000L) != 0L) - return 1; - if ((active0 & 0x3f8e00070800200L) != 0L) + if ((active0 & 0x7f1c000e1002200L) != 0L) { - jjmatchedKind = 65; + jjmatchedKind = 66; jjmatchedPos = 6; return 1; } + if ((active0 & 0x800000L) != 0L) + return 1; return -1; case 7: - if ((active0 & 0x100000000800200L) != 0L) - return 1; - if ((active0 & 0x2f8e00070000000L) != 0L) + if ((active0 & 0x5f1c000e0000000L) != 0L) { - jjmatchedKind = 65; + jjmatchedKind = 66; jjmatchedPos = 7; return 1; } + if ((active0 & 0x200000001002200L) != 0L) + return 1; return -1; case 8: - if ((active0 & 0x8000020000000L) != 0L) - return 1; - if ((active0 & 0x2f0e00050000000L) != 0L) + if ((active0 & 0x5e1c000a0000000L) != 0L) { - jjmatchedKind = 65; + jjmatchedKind = 66; jjmatchedPos = 8; return 1; } + if ((active0 & 0x10000040000000L) != 0L) + return 1; return -1; case 9: - if ((active0 & 0x400000000000L) != 0L) - return 1; - if ((active0 & 0x2f0a00050000000L) != 0L) + if ((active0 & 0x5e14000a0000000L) != 0L) { - jjmatchedKind = 65; + jjmatchedKind = 66; jjmatchedPos = 9; return 1; } + if ((active0 & 0x800000000000L) != 0L) + return 1; return -1; case 10: - if ((active0 & 0x290800000000000L) != 0L) - return 1; - if ((active0 & 0x60200050000000L) != 0L) + if ((active0 & 0xc04000a0000000L) != 0L) { - jjmatchedKind = 65; + jjmatchedKind = 66; jjmatchedPos = 10; return 1; } + if ((active0 & 0x521000000000000L) != 0L) + return 1; return -1; case 11: - if ((active0 & 0x200040000000L) != 0L) + if ((active0 & 0x400080000000L) != 0L) return 1; - if ((active0 & 0x60000010000000L) != 0L) + if ((active0 & 0xc0000020000000L) != 0L) { - jjmatchedKind = 65; + jjmatchedKind = 66; jjmatchedPos = 11; return 1; } return -1; case 12: - if ((active0 & 0x60000010000000L) != 0L) + if ((active0 & 0xc0000020000000L) != 0L) { - jjmatchedKind = 65; + jjmatchedKind = 66; jjmatchedPos = 12; return 1; } return -1; case 13: - if ((active0 & 0x10000000L) != 0L) + if ((active0 & 0x20000000L) != 0L) return 1; - if ((active0 & 0x60000000000000L) != 0L) + if ((active0 & 0xc0000000000000L) != 0L) { - jjmatchedKind = 65; + jjmatchedKind = 66; jjmatchedPos = 13; return 1; } return -1; case 14: - if ((active0 & 0x60000000000000L) != 0L) + if ((active0 & 0xc0000000000000L) != 0L) { - jjmatchedKind = 65; + jjmatchedKind = 66; jjmatchedPos = 14; return 1; } return -1; case 15: - if ((active0 & 0x60000000000000L) != 0L) + if ((active0 & 0xc0000000000000L) != 0L) { - jjmatchedKind = 65; + jjmatchedKind = 66; jjmatchedPos = 15; return 1; } return -1; case 16: - if ((active0 & 0x60000000000000L) != 0L) + if ((active0 & 0xc0000000000000L) != 0L) { - jjmatchedKind = 65; + jjmatchedKind = 66; jjmatchedPos = 16; return 1; } return -1; case 17: - if ((active0 & 0x60000000000000L) != 0L) + if ((active0 & 0xc0000000000000L) != 0L) { - jjmatchedKind = 65; + jjmatchedKind = 66; jjmatchedPos = 17; return 1; } return -1; case 18: - if ((active0 & 0x60000000000000L) != 0L) + if ((active0 & 0xc0000000000000L) != 0L) { - jjmatchedKind = 65; + jjmatchedKind = 66; jjmatchedPos = 18; return 1; } return -1; case 19: - if ((active0 & 0x40000000000000L) != 0L) + if ((active0 & 0x80000000000000L) != 0L) { - jjmatchedKind = 65; + jjmatchedKind = 66; jjmatchedPos = 19; return 1; } - if ((active0 & 0x20000000000000L) != 0L) + if ((active0 & 0x40000000000000L) != 0L) return 1; return -1; default : @@ -259,85 +259,85 @@ switch(curChar) { case 33: - return jjMoveStringLiteralDfa1_0(0x80000000000L, 0x0L); + return jjMoveStringLiteralDfa1_0(0x100000000000L, 0x0L); case 40: - return jjStopAtPos(0, 36); + return jjStopAtPos(0, 37); case 41: - return jjStopAtPos(0, 37); + return jjStopAtPos(0, 38); case 42: - return jjStopAtPos(0, 44); + return jjStopAtPos(0, 45); case 44: - return jjStopAtPos(0, 34); + return jjStopAtPos(0, 35); case 45: + return jjMoveStringLiteralDfa1_0(0x4000000000000000L, 0x0L); + case 46: + jjmatchedKind = 36; return jjMoveStringLiteralDfa1_0(0x2000000000000000L, 0x0L); - case 46: - jjmatchedKind = 35; - return jjMoveStringLiteralDfa1_0(0x1000000000000000L, 0x0L); case 59: - return jjStopAtPos(0, 71); + return jjStopAtPos(0, 72); case 60: - return jjStopAtPos(0, 40); + return jjStopAtPos(0, 41); case 61: - return jjStopAtPos(0, 38); + return jjStopAtPos(0, 39); case 62: - return jjStopAtPos(0, 39); + return jjStopAtPos(0, 40); case 65: case 97: - return jjMoveStringLiteralDfa1_0(0x400000100000040L, 0x0L); + return jjMoveStringLiteralDfa1_0(0x800000200000040L, 0x0L); case 66: case 98: - return jjMoveStringLiteralDfa1_0(0x12000000000000L, 0x1L); + return jjMoveStringLiteralDfa1_0(0x24000000000000L, 0x2L); case 67: case 99: - return jjMoveStringLiteralDfa1_0(0x820800010000880L, 0x0L); + return jjMoveStringLiteralDfa1_0(0x1041000020000880L, 0x0L); case 68: case 100: - return jjMoveStringLiteralDfa1_0(0x481600L, 0x0L); + return jjMoveStringLiteralDfa1_0(0x901600L, 0x0L); case 69: case 101: - return jjMoveStringLiteralDfa1_0(0x208000L, 0x0L); + return jjMoveStringLiteralDfa1_0(0x410000L, 0x0L); case 70: case 102: - return jjMoveStringLiteralDfa1_0(0x2002000L, 0x0L); + return jjMoveStringLiteralDfa1_0(0x4004000L, 0x0L); case 71: case 103: - return jjMoveStringLiteralDfa1_0(0x8000000000000000L, 0x0L); + return jjMoveStringLiteralDfa1_0(0x0L, 0x1L); case 72: case 104: return jjMoveStringLiteralDfa1_0(0x20L, 0x0L); case 73: case 105: - return jjMoveStringLiteralDfa1_0(0x8040000030000L, 0x0L); + return jjMoveStringLiteralDfa1_0(0x10080000060000L, 0x0L); case 74: case 106: - return jjMoveStringLiteralDfa1_0(0x4000L, 0x0L); + return jjMoveStringLiteralDfa1_0(0x8000L, 0x0L); case 76: case 108: - return jjMoveStringLiteralDfa1_0(0x80000000L, 0x0L); + return jjMoveStringLiteralDfa1_0(0x100000000L, 0x0L); case 77: case 109: - return jjMoveStringLiteralDfa1_0(0x600000000000L, 0x0L); + return jjMoveStringLiteralDfa1_0(0xc00000000000L, 0x0L); case 78: case 110: - return jjMoveStringLiteralDfa1_0(0x301020040000000L, 0x0L); + return jjMoveStringLiteralDfa1_0(0x602040080000000L, 0x0L); case 79: case 111: - return jjMoveStringLiteralDfa1_0(0x200000000L, 0x0L); + return jjMoveStringLiteralDfa1_0(0x400000000L, 0x0L); case 82: case 114: - return jjMoveStringLiteralDfa1_0(0x44000004000000L, 0x0L); + return jjMoveStringLiteralDfa1_0(0x88000008000000L, 0x0L); case 83: case 115: - return jjMoveStringLiteralDfa1_0(0x4000000000900100L, 0x0L); + return jjMoveStringLiteralDfa1_0(0x8000000001200100L, 0x0L); case 84: case 116: - return jjMoveStringLiteralDfa1_0(0x20040000L, 0x0L); + return jjMoveStringLiteralDfa1_0(0x40082000L, 0x0L); case 86: case 118: - return jjMoveStringLiteralDfa1_0(0x80000008000000L, 0x0L); + return jjMoveStringLiteralDfa1_0(0x100000010000000L, 0x0L); case 87: case 119: - return jjMoveStringLiteralDfa1_0(0x1000000L, 0x0L); + return jjMoveStringLiteralDfa1_0(0x2000000L, 0x0L); default : return jjMoveNfa_0(0, 0); } @@ -352,64 +352,64 @@ switch(curChar) { case 61: - if ((active0 & 0x80000000000L) != 0L) - return jjStopAtPos(1, 43); + if ((active0 & 0x100000000000L) != 0L) + return jjStopAtPos(1, 44); break; case 65: case 97: - return jjMoveStringLiteralDfa2_0(active0, 0x4000600008044000L, active1, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0x8000c00010088000L, active1, 0L); case 68: case 100: - return jjMoveStringLiteralDfa2_0(active0, 0x400000000000000L, active1, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0x800000000000000L, active1, 0L); case 69: case 101: - return jjMoveStringLiteralDfa2_0(active0, 0xc4000000180620L, active1, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0x188000000300620L, active1, 0L); case 72: case 104: - return jjMoveStringLiteralDfa2_0(active0, 0x800000001000100L, active1, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0x1000000002000100L, active1, 0L); case 73: case 105: - return jjMoveStringLiteralDfa2_0(active0, 0xa0400000L, active1, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0x140800000L, active1, 0L); case 76: case 108: - return jjMoveStringLiteralDfa2_0(active0, 0x120000000000c0L, active1, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0x240000000000c0L, active1, 0L); case 77: case 109: - return jjMoveStringLiteralDfa2_0(active0, 0x1000000000000000L, active1, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0x2000000000000000L, active1, 0L); case 78: case 110: - if ((active0 & 0x40000000000L) != 0L) + if ((active0 & 0x80000000000L) != 0L) { - jjmatchedKind = 42; + jjmatchedKind = 43; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_0(active0, 0x8000100230000L, active1, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0x10000200460000L, active1, 0L); case 79: case 111: - return jjMoveStringLiteralDfa2_0(active0, 0x21820014000000L, active1, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0x43040028000000L, active1, 0L); case 82: case 114: - if ((active0 & 0x200000000L) != 0L) - return jjStartNfaWithStates_0(1, 33, 1); - return jjMoveStringLiteralDfa2_0(active0, 0xa000000002001800L, active1, 0L); + if ((active0 & 0x400000000L) != 0L) + return jjStartNfaWithStates_0(1, 34, 1); + return jjMoveStringLiteralDfa2_0(active0, 0x4000000004003800L, active1, 0x1L); case 83: case 115: - if ((active0 & 0x2000L) != 0L) - return jjStartNfaWithStates_0(1, 13, 1); + if ((active0 & 0x4000L) != 0L) + return jjStartNfaWithStates_0(1, 14, 1); break; case 84: case 116: - return jjMoveStringLiteralDfa2_0(active0, 0x800000L, active1, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0x1000000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa2_0(active0, 0x300000040000000L, active1, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0x600000080000000L, active1, 0L); case 88: case 120: - return jjMoveStringLiteralDfa2_0(active0, 0x8000L, active1, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0x10000L, active1, 0L); case 89: case 121: - if ((active1 & 0x1L) != 0L) - return jjStartNfaWithStates_0(1, 64, 1); + if ((active1 & 0x2L) != 0L) + return jjStartNfaWithStates_0(1, 65, 1); break; default : break; @@ -422,98 +422,98 @@ return jjStartNfa_0(0, old0, old1); try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { - jjStopStringLiteralDfa_0(1, active0, 0L); + jjStopStringLiteralDfa_0(1, active0, active1); return 2; } switch(curChar) { case 95: - return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000L); + return jjMoveStringLiteralDfa3_0(active0, 0x10000000000000L, active1, 0L); case 65: case 97: - return jjMoveStringLiteralDfa3_0(active0, 0x800000000a00000L); + return jjMoveStringLiteralDfa3_0(active0, 0x1000000001400000L, active1, 0L); case 66: case 98: - return jjMoveStringLiteralDfa3_0(active0, 0x40000L); + return jjMoveStringLiteralDfa3_0(active0, 0x80000L, active1, 0L); case 67: case 99: - return jjMoveStringLiteralDfa3_0(active0, 0x84000000000000L); + return jjMoveStringLiteralDfa3_0(active0, 0x108000000000000L, active1, 0L); case 68: case 100: - if ((active0 & 0x100000000L) != 0L) - return jjStartNfaWithStates_0(2, 32, 1); - else if ((active0 & 0x400000000000000L) != 0L) - return jjStartNfaWithStates_0(2, 58, 1); + if ((active0 & 0x200000000L) != 0L) + return jjStartNfaWithStates_0(2, 33, 1); + else if ((active0 & 0x800000000000000L) != 0L) + return jjStartNfaWithStates_0(2, 59, 1); break; case 69: case 101: - return jjMoveStringLiteralDfa3_0(active0, 0x1000000001000880L); + return jjMoveStringLiteralDfa3_0(active0, 0x2000000002000880L, active1, 0L); case 73: case 105: - return jjMoveStringLiteralDfa3_0(active0, 0x8000L); + return jjMoveStringLiteralDfa3_0(active0, 0x10000L, active1, 0L); case 76: case 108: - return jjMoveStringLiteralDfa3_0(active0, 0x18180020L); + return jjMoveStringLiteralDfa3_0(active0, 0x30300020L, active1, 0L); case 77: case 109: - return jjMoveStringLiteralDfa3_0(active0, 0x3008000e0000000L); + return jjMoveStringLiteralDfa3_0(active0, 0x6010001c0000000L, active1, 0L); case 78: case 110: - return jjMoveStringLiteralDfa3_0(active0, 0x1000000000000L); + return jjMoveStringLiteralDfa3_0(active0, 0x2000000000000L, active1, 0L); case 79: case 111: - return jjMoveStringLiteralDfa3_0(active0, 0xa012000002001100L); + return jjMoveStringLiteralDfa3_0(active0, 0x4024000004001100L, active1, 0x1L); case 82: case 114: - if ((active0 & 0x4000L) != 0L) - return jjStartNfaWithStates_0(2, 14, 1); + if ((active0 & 0x8000L) != 0L) + return jjStartNfaWithStates_0(2, 15, 1); break; case 83: case 115: - return jjMoveStringLiteralDfa3_0(active0, 0x410600L); + return jjMoveStringLiteralDfa3_0(active0, 0x820600L, active1, 0L); case 84: case 116: - if ((active0 & 0x20000000000L) != 0L) - return jjStartNfaWithStates_0(2, 41, 1); - return jjMoveStringLiteralDfa3_0(active0, 0x40000000020040L); + if ((active0 & 0x40000000000L) != 0L) + return jjStartNfaWithStates_0(2, 42, 1); + return jjMoveStringLiteralDfa3_0(active0, 0x80000000040040L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa3_0(active0, 0x20000000000000L); + return jjMoveStringLiteralDfa3_0(active0, 0x40000000002000L, active1, 0L); case 86: case 118: - return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000000L); + return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000000L, active1, 0L); case 87: case 119: - if ((active0 & 0x4000000L) != 0L) - return jjStartNfaWithStates_0(2, 26, 1); + if ((active0 & 0x8000000L) != 0L) + return jjStartNfaWithStates_0(2, 27, 1); break; case 88: case 120: - return jjMoveStringLiteralDfa3_0(active0, 0x600000000000L); + return jjMoveStringLiteralDfa3_0(active0, 0xc00000000000L, active1, 0L); default : break; } - return jjStartNfa_0(1, active0, 0L); + return jjStartNfa_0(1, active0, active1); } -private final int jjMoveStringLiteralDfa3_0(long old0, long active0) +private final int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long active1) { - if (((active0 &= old0)) == 0L) - return jjStartNfa_0(1, old0, 0L); + if (((active0 &= old0) | (active1 &= old1)) == 0L) + return jjStartNfa_0(1, old0, old1); try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { - jjStopStringLiteralDfa_0(2, active0, 0L); + jjStopStringLiteralDfa_0(2, active0, active1); return 3; } switch(curChar) { case 95: - return jjMoveStringLiteralDfa4_0(active0, 0x300600040000000L); + return jjMoveStringLiteralDfa4_0(active0, 0x600c00080000000L, active1, 0L); case 65: case 97: - return jjMoveStringLiteralDfa4_0(active0, 0x400880L); + return jjMoveStringLiteralDfa4_0(active0, 0x800880L, active1, 0L); case 66: case 98: - return jjMoveStringLiteralDfa4_0(active0, 0x200000L); + return jjMoveStringLiteralDfa4_0(active0, 0x400000L, active1, 0L); case 67: case 99: if ((active0 & 0x400L) != 0L) @@ -521,51 +521,51 @@ jjmatchedKind = 10; jjmatchedPos = 3; } - return jjMoveStringLiteralDfa4_0(active0, 0x2000000000200L); + return jjMoveStringLiteralDfa4_0(active0, 0x4000000000200L, active1, 0L); case 69: case 101: - if ((active0 & 0x1000000000000L) != 0L) - return jjStartNfaWithStates_0(3, 48, 1); - else if ((active0 & 0x4000000000000000L) != 0L) - return jjStartNfaWithStates_0(3, 62, 1); - return jjMoveStringLiteralDfa4_0(active0, 0x20190040L); + if ((active0 & 0x2000000000000L) != 0L) + return jjStartNfaWithStates_0(3, 49, 1); + else if ((active0 & 0x8000000000000000L) != 0L) + return jjStartNfaWithStates_0(3, 63, 1); + return jjMoveStringLiteralDfa4_0(active0, 0x40320040L, active1, 0L); case 73: case 105: - return jjMoveStringLiteralDfa4_0(active0, 0x80000000L); + return jjMoveStringLiteralDfa4_0(active0, 0x100000000L, active1, 0L); case 76: case 108: - return jjMoveStringLiteralDfa4_0(active0, 0x40000L); + return jjMoveStringLiteralDfa4_0(active0, 0x80000L, active1, 0L); case 77: case 109: - if ((active0 & 0x2000000L) != 0L) - return jjStartNfaWithStates_0(3, 25, 1); - return jjMoveStringLiteralDfa4_0(active0, 0x8000000000000L); + if ((active0 & 0x4000000L) != 0L) + return jjStartNfaWithStates_0(3, 26, 1); + return jjMoveStringLiteralDfa4_0(active0, 0x10000000000000L, active1, 0L); case 78: case 110: - return jjMoveStringLiteralDfa4_0(active0, 0x820000000000000L); + return jjMoveStringLiteralDfa4_0(active0, 0x1040000000002000L, active1, 0L); case 79: case 111: - if ((active0 & 0x20000L) != 0L) - return jjStartNfaWithStates_0(3, 17, 1); - return jjMoveStringLiteralDfa4_0(active0, 0x2054000000000000L); + if ((active0 & 0x40000L) != 0L) + return jjStartNfaWithStates_0(3, 18, 1); + return jjMoveStringLiteralDfa4_0(active0, 0x40a8000000000000L, active1, 0L); case 80: case 112: if ((active0 & 0x20L) != 0L) return jjStartNfaWithStates_0(3, 5, 1); else if ((active0 & 0x1000L) != 0L) return jjStartNfaWithStates_0(3, 12, 1); - return jjMoveStringLiteralDfa4_0(active0, 0x800000000000L); + return jjMoveStringLiteralDfa4_0(active0, 0x1000000000000L, active1, 0L); case 82: case 114: - return jjMoveStringLiteralDfa4_0(active0, 0x1800000L); + return jjMoveStringLiteralDfa4_0(active0, 0x3000000L, active1, 0L); case 84: case 116: - if ((active0 & 0x8000L) != 0L) - return jjStartNfaWithStates_0(3, 15, 1); - return jjMoveStringLiteralDfa4_0(active0, 0x1080000000000000L); + if ((active0 & 0x10000L) != 0L) + return jjStartNfaWithStates_0(3, 16, 1); + return jjMoveStringLiteralDfa4_0(active0, 0x2100000000000000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa4_0(active0, 0x8000000018000000L); + return jjMoveStringLiteralDfa4_0(active0, 0x30000000L, active1, 0x1L); case 87: case 119: if ((active0 & 0x100L) != 0L) @@ -574,59 +574,59 @@ default : break; } - return jjStartNfa_0(2, active0, 0L); + return jjStartNfa_0(2, active0, active1); } -private final int jjMoveStringLiteralDfa4_0(long old0, long active0) +private final int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long active1) { - if (((active0 &= old0)) == 0L) - return jjStartNfa_0(2, old0, 0L); + if (((active0 &= old0) | (active1 &= old1)) == 0L) + return jjStartNfa_0(2, old0, old1); try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { - jjStopStringLiteralDfa_0(3, active0, 0L); + jjStopStringLiteralDfa_0(3, active0, active1); return 4; } switch(curChar) { case 65: case 97: - return jjMoveStringLiteralDfa5_0(active0, 0x1000000000000000L); + return jjMoveStringLiteralDfa5_0(active0, 0x2000000000000000L, active1, 0L); case 66: case 98: - return jjMoveStringLiteralDfa5_0(active0, 0x400000L); + return jjMoveStringLiteralDfa5_0(active0, 0x800000L, active1, 0L); case 67: case 99: - return jjMoveStringLiteralDfa5_0(active0, 0x100000L); + return jjMoveStringLiteralDfa5_0(active0, 0x202000L, active1, 0L); case 69: case 101: - if ((active0 & 0x40000L) != 0L) - return jjStartNfaWithStates_0(4, 18, 1); - else if ((active0 & 0x1000000L) != 0L) - return jjStartNfaWithStates_0(4, 24, 1); - return jjMoveStringLiteralDfa5_0(active0, 0x208000008000000L); + if ((active0 & 0x80000L) != 0L) + return jjStartNfaWithStates_0(4, 19, 1); + else if ((active0 & 0x2000000L) != 0L) + return jjStartNfaWithStates_0(4, 25, 1); + return jjMoveStringLiteralDfa5_0(active0, 0x410000010000000L, active1, 0L); case 71: case 103: - return jjMoveStringLiteralDfa5_0(active0, 0x800000000000000L); + return jjMoveStringLiteralDfa5_0(active0, 0x1000000000000000L, active1, 0L); case 72: case 104: - return jjMoveStringLiteralDfa5_0(active0, 0x100000000000000L); + return jjMoveStringLiteralDfa5_0(active0, 0x200000000000000L, active1, 0L); case 75: case 107: - if ((active0 & 0x2000000000000L) != 0L) - return jjStartNfaWithStates_0(4, 49, 1); + if ((active0 & 0x4000000000000L) != 0L) + return jjStartNfaWithStates_0(4, 50, 1); break; case 76: case 108: - return jjMoveStringLiteralDfa5_0(active0, 0x400000200000L); + return jjMoveStringLiteralDfa5_0(active0, 0x800000400000L, active1, 0L); case 77: case 109: - return jjMoveStringLiteralDfa5_0(active0, 0x10000010000000L); + return jjMoveStringLiteralDfa5_0(active0, 0x20000020000000L, active1, 0L); case 79: case 111: - return jjMoveStringLiteralDfa5_0(active0, 0x80000000000000L); + return jjMoveStringLiteralDfa5_0(active0, 0x100000000000000L, active1, 0L); case 80: case 112: - if ((active0 & 0x8000000000000000L) != 0L) - return jjStartNfaWithStates_0(4, 63, 1); + if ((active1 & 0x1L) != 0L) + return jjStartNfaWithStates_0(4, 64, 1); break; case 82: case 114: @@ -634,30 +634,30 @@ return jjStartNfaWithStates_0(4, 6, 1); else if ((active0 & 0x80L) != 0L) return jjStartNfaWithStates_0(4, 7, 1); - return jjMoveStringLiteralDfa5_0(active0, 0x4800000010200L); + return jjMoveStringLiteralDfa5_0(active0, 0x9000000020200L, active1, 0L); case 83: case 115: - return jjMoveStringLiteralDfa5_0(active0, 0x20000000L); + return jjMoveStringLiteralDfa5_0(active0, 0x40000000L, active1, 0L); case 84: case 116: - if ((active0 & 0x80000000L) != 0L) - return jjStartNfaWithStates_0(4, 31, 1); - return jjMoveStringLiteralDfa5_0(active0, 0x2020000000880800L); + if ((active0 & 0x100000000L) != 0L) + return jjStartNfaWithStates_0(4, 32, 1); + return jjMoveStringLiteralDfa5_0(active0, 0x4040000001100800L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa5_0(active0, 0x40000000000000L); + return jjMoveStringLiteralDfa5_0(active0, 0x80000000000000L, active1, 0L); case 86: case 118: - return jjMoveStringLiteralDfa5_0(active0, 0x200040000000L); + return jjMoveStringLiteralDfa5_0(active0, 0x400080000000L, active1, 0L); default : break; } - return jjStartNfa_0(3, active0, 0L); + return jjStartNfa_0(3, active0, active1); } -private final int jjMoveStringLiteralDfa5_0(long old0, long active0) +private final int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long active1) { - if (((active0 &= old0)) == 0L) - return jjStartNfa_0(3, old0, 0L); + if (((active0 &= old0) | (active1 &= old1)) == 0L) + return jjStartNfa_0(3, old0, old1); try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { jjStopStringLiteralDfa_0(4, active0, 0L); @@ -666,65 +666,65 @@ switch(curChar) { case 45: - if ((active0 & 0x2000000000000000L) != 0L) - return jjStartNfaWithStates_0(5, 61, 1); + if ((active0 & 0x4000000000000000L) != 0L) + return jjStartNfaWithStates_0(5, 62, 1); break; case 46: - if ((active0 & 0x1000000000000000L) != 0L) - return jjStopAtPos(5, 60); + if ((active0 & 0x2000000000000000L) != 0L) + return jjStopAtPos(5, 61); break; case 65: case 97: - return jjMoveStringLiteralDfa6_0(active0, 0x100000000000000L); + return jjMoveStringLiteralDfa6_0(active0, 0x200000000002000L); case 67: case 99: - return jjMoveStringLiteralDfa6_0(active0, 0x40000000000000L); + return jjMoveStringLiteralDfa6_0(active0, 0x80000000000000L); case 68: case 100: - if ((active0 & 0x4000000000000L) != 0L) - return jjStartNfaWithStates_0(5, 50, 1); + if ((active0 & 0x8000000000000L) != 0L) + return jjStartNfaWithStates_0(5, 51, 1); break; case 69: case 101: if ((active0 & 0x800L) != 0L) return jjStartNfaWithStates_0(5, 11, 1); - else if ((active0 & 0x80000L) != 0L) - return jjStartNfaWithStates_0(5, 19, 1); - else if ((active0 & 0x200000L) != 0L) - return jjStartNfaWithStates_0(5, 21, 1); - else if ((active0 & 0x800000000000000L) != 0L) - return jjStartNfaWithStates_0(5, 59, 1); - return jjMoveStringLiteralDfa6_0(active0, 0xe00040000000L); + else if ((active0 & 0x100000L) != 0L) + return jjStartNfaWithStates_0(5, 20, 1); + else if ((active0 & 0x400000L) != 0L) + return jjStartNfaWithStates_0(5, 22, 1); + else if ((active0 & 0x1000000000000000L) != 0L) + return jjStartNfaWithStates_0(5, 60, 1); + return jjMoveStringLiteralDfa6_0(active0, 0x1c00080000000L); case 70: case 102: - return jjMoveStringLiteralDfa6_0(active0, 0x10000000000000L); + return jjMoveStringLiteralDfa6_0(active0, 0x20000000000000L); case 73: case 105: - return jjMoveStringLiteralDfa6_0(active0, 0x20000000800200L); + return jjMoveStringLiteralDfa6_0(active0, 0x40000001000200L); case 76: case 108: - return jjMoveStringLiteralDfa6_0(active0, 0x400000L); + return jjMoveStringLiteralDfa6_0(active0, 0x800000L); case 77: case 109: - return jjMoveStringLiteralDfa6_0(active0, 0x8000000000000L); + return jjMoveStringLiteralDfa6_0(active0, 0x10000000000000L); case 78: case 110: - return jjMoveStringLiteralDfa6_0(active0, 0x200000010000000L); + return jjMoveStringLiteralDfa6_0(active0, 0x400000020000000L); case 82: case 114: - return jjMoveStringLiteralDfa6_0(active0, 0x80000000000000L); + return jjMoveStringLiteralDfa6_0(active0, 0x100000000000000L); case 83: case 115: - if ((active0 & 0x8000000L) != 0L) - return jjStartNfaWithStates_0(5, 27, 1); + if ((active0 & 0x10000000L) != 0L) + return jjStartNfaWithStates_0(5, 28, 1); break; case 84: case 116: - if ((active0 & 0x10000L) != 0L) - return jjStartNfaWithStates_0(5, 16, 1); - else if ((active0 & 0x100000L) != 0L) - return jjStartNfaWithStates_0(5, 20, 1); - return jjMoveStringLiteralDfa6_0(active0, 0x20000000L); + if ((active0 & 0x20000L) != 0L) + return jjStartNfaWithStates_0(5, 17, 1); + else if ((active0 & 0x200000L) != 0L) + return jjStartNfaWithStates_0(5, 21, 1); + return jjMoveStringLiteralDfa6_0(active0, 0x40000000L); default : break; } @@ -742,42 +742,42 @@ switch(curChar) { case 95: - return jjMoveStringLiteralDfa7_0(active0, 0x80000000000000L); + return jjMoveStringLiteralDfa7_0(active0, 0x100000000000000L); case 65: case 97: - return jjMoveStringLiteralDfa7_0(active0, 0x20000000L); + return jjMoveStringLiteralDfa7_0(active0, 0x40000000L); case 66: case 98: return jjMoveStringLiteralDfa7_0(active0, 0x200L); case 69: case 101: - if ((active0 & 0x400000L) != 0L) - return jjStartNfaWithStates_0(6, 22, 1); + if ((active0 & 0x800000L) != 0L) + return jjStartNfaWithStates_0(6, 23, 1); break; case 70: case 102: - return jjMoveStringLiteralDfa7_0(active0, 0x10000000L); + return jjMoveStringLiteralDfa7_0(active0, 0x20000000L); case 72: case 104: - return jjMoveStringLiteralDfa7_0(active0, 0x40000000000000L); + return jjMoveStringLiteralDfa7_0(active0, 0x80000000000000L); case 73: case 105: - return jjMoveStringLiteralDfa7_0(active0, 0x10000000000000L); + return jjMoveStringLiteralDfa7_0(active0, 0x20000000000000L); case 78: case 110: - return jjMoveStringLiteralDfa7_0(active0, 0x20400000800000L); + return jjMoveStringLiteralDfa7_0(active0, 0x40800001000000L); case 79: case 111: - return jjMoveStringLiteralDfa7_0(active0, 0x8000000000000L); + return jjMoveStringLiteralDfa7_0(active0, 0x10000000000000L); case 82: case 114: - return jjMoveStringLiteralDfa7_0(active0, 0x200040000000L); + return jjMoveStringLiteralDfa7_0(active0, 0x400080000000L); case 83: case 115: - return jjMoveStringLiteralDfa7_0(active0, 0x100800000000000L); + return jjMoveStringLiteralDfa7_0(active0, 0x201000000000000L); case 84: case 116: - return jjMoveStringLiteralDfa7_0(active0, 0x200000000000000L); + return jjMoveStringLiteralDfa7_0(active0, 0x400000000002000L); default : break; } @@ -796,34 +796,36 @@ { case 65: case 97: - return jjMoveStringLiteralDfa8_0(active0, 0x10000000L); + return jjMoveStringLiteralDfa8_0(active0, 0x20000000L); case 69: case 101: if ((active0 & 0x200L) != 0L) return jjStartNfaWithStates_0(7, 9, 1); - return jjMoveStringLiteralDfa8_0(active0, 0x40000000000000L); + else if ((active0 & 0x2000L) != 0L) + return jjStartNfaWithStates_0(7, 13, 1); + return jjMoveStringLiteralDfa8_0(active0, 0x80000000000000L); case 71: case 103: - if ((active0 & 0x800000L) != 0L) - return jjStartNfaWithStates_0(7, 23, 1); - return jjMoveStringLiteralDfa8_0(active0, 0x20400000000000L); + if ((active0 & 0x1000000L) != 0L) + return jjStartNfaWithStates_0(7, 24, 1); + return jjMoveStringLiteralDfa8_0(active0, 0x40800000000000L); case 72: case 104: - if ((active0 & 0x100000000000000L) != 0L) - return jjStartNfaWithStates_0(7, 56, 1); + if ((active0 & 0x200000000000000L) != 0L) + return jjStartNfaWithStates_0(7, 57, 1); break; case 76: case 108: - return jjMoveStringLiteralDfa8_0(active0, 0x10000000000000L); + return jjMoveStringLiteralDfa8_0(active0, 0x20000000000000L); case 77: case 109: - return jjMoveStringLiteralDfa8_0(active0, 0x20000000L); + return jjMoveStringLiteralDfa8_0(active0, 0x40000000L); case 82: case 114: - return jjMoveStringLiteralDfa8_0(active0, 0x208000000000000L); + return jjMoveStringLiteralDfa8_0(active0, 0x410000000000000L); case 83: case 115: - return jjMoveStringLiteralDfa8_0(active0, 0x80a00040000000L); + return jjMoveStringLiteralDfa8_0(active0, 0x101400080000000L); default : break; } @@ -841,28 +843,28 @@ switch(curChar) { case 95: - return jjMoveStringLiteralDfa9_0(active0, 0x20000000000000L); + return jjMoveStringLiteralDfa9_0(active0, 0x40000000000000L); case 68: case 100: - return jjMoveStringLiteralDfa9_0(active0, 0x40000000000000L); + return jjMoveStringLiteralDfa9_0(active0, 0x80000000000000L); case 73: case 105: - return jjMoveStringLiteralDfa9_0(active0, 0x280a00040000000L); + return jjMoveStringLiteralDfa9_0(active0, 0x501400080000000L); case 77: case 109: - return jjMoveStringLiteralDfa9_0(active0, 0x10000000L); + return jjMoveStringLiteralDfa9_0(active0, 0x20000000L); case 80: case 112: - if ((active0 & 0x20000000L) != 0L) - return jjStartNfaWithStates_0(8, 29, 1); + if ((active0 & 0x40000000L) != 0L) + return jjStartNfaWithStates_0(8, 30, 1); break; case 84: case 116: - return jjMoveStringLiteralDfa9_0(active0, 0x10400000000000L); + return jjMoveStringLiteralDfa9_0(active0, 0x20800000000000L); case 89: case 121: - if ((active0 & 0x8000000000000L) != 0L) - return jjStartNfaWithStates_0(8, 51, 1); + if ((active0 & 0x10000000000000L) != 0L) + return jjStartNfaWithStates_0(8, 52, 1); break; default : break; @@ -881,27 +883,27 @@ switch(curChar) { case 95: - return jjMoveStringLiteralDfa10_0(active0, 0x40000000000000L); + return jjMoveStringLiteralDfa10_0(active0, 0x80000000000000L); case 66: case 98: - return jjMoveStringLiteralDfa10_0(active0, 0x20000000000000L); + return jjMoveStringLiteralDfa10_0(active0, 0x40000000000000L); case 69: case 101: - return jjMoveStringLiteralDfa10_0(active0, 0x210000000000000L); + return jjMoveStringLiteralDfa10_0(active0, 0x420000000000000L); case 72: case 104: - if ((active0 & 0x400000000000L) != 0L) - return jjStartNfaWithStates_0(9, 46, 1); + if ((active0 & 0x800000000000L) != 0L) + return jjStartNfaWithStates_0(9, 47, 1); break; case 73: case 105: - return jjMoveStringLiteralDfa10_0(active0, 0x10000000L); + return jjMoveStringLiteralDfa10_0(active0, 0x20000000L); case 79: case 111: - return jjMoveStringLiteralDfa10_0(active0, 0xa00040000000L); + return jjMoveStringLiteralDfa10_0(active0, 0x1400080000000L); case 90: case 122: - return jjMoveStringLiteralDfa10_0(active0, 0x80000000000000L); + return jjMoveStringLiteralDfa10_0(active0, 0x100000000000000L); default : break; } @@ -920,29 +922,29 @@ { case 66: case 98: - return jjMoveStringLiteralDfa11_0(active0, 0x40000000000000L); + return jjMoveStringLiteralDfa11_0(active0, 0x80000000000000L); case 69: case 101: - if ((active0 & 0x80000000000000L) != 0L) - return jjStartNfaWithStates_0(10, 55, 1); + if ((active0 & 0x100000000000000L) != 0L) + return jjStartNfaWithStates_0(10, 56, 1); break; case 76: case 108: - return jjMoveStringLiteralDfa11_0(active0, 0x20000010000000L); + return jjMoveStringLiteralDfa11_0(active0, 0x40000020000000L); case 78: case 110: - if ((active0 & 0x800000000000L) != 0L) - return jjStartNfaWithStates_0(10, 47, 1); - return jjMoveStringLiteralDfa11_0(active0, 0x200040000000L); + if ((active0 & 0x1000000000000L) != 0L) + return jjStartNfaWithStates_0(10, 48, 1); + return jjMoveStringLiteralDfa11_0(active0, 0x400080000000L); case 82: case 114: - if ((active0 & 0x10000000000000L) != 0L) - return jjStartNfaWithStates_0(10, 52, 1); + if ((active0 & 0x20000000000000L) != 0L) + return jjStartNfaWithStates_0(10, 53, 1); break; case 83: case 115: - if ((active0 & 0x200000000000000L) != 0L) - return jjStartNfaWithStates_0(10, 57, 1); + if ((active0 & 0x400000000000000L) != 0L) + return jjStartNfaWithStates_0(10, 58, 1); break; default : break; @@ -962,19 +964,19 @@ { case 73: case 105: - return jjMoveStringLiteralDfa12_0(active0, 0x10000000L); + return jjMoveStringLiteralDfa12_0(active0, 0x20000000L); case 76: case 108: - return jjMoveStringLiteralDfa12_0(active0, 0x40000000000000L); + return jjMoveStringLiteralDfa12_0(active0, 0x80000000000000L); case 79: case 111: - return jjMoveStringLiteralDfa12_0(active0, 0x20000000000000L); + return jjMoveStringLiteralDfa12_0(active0, 0x40000000000000L); case 83: case 115: - if ((active0 & 0x40000000L) != 0L) - return jjStartNfaWithStates_0(11, 30, 1); - else if ((active0 & 0x200000000000L) != 0L) - return jjStartNfaWithStates_0(11, 45, 1); + if ((active0 & 0x80000000L) != 0L) + return jjStartNfaWithStates_0(11, 31, 1); + else if ((active0 & 0x400000000000L) != 0L) + return jjStartNfaWithStates_0(11, 46, 1); break; default : break; @@ -994,10 +996,10 @@ { case 69: case 101: - return jjMoveStringLiteralDfa13_0(active0, 0x10000000L); + return jjMoveStringLiteralDfa13_0(active0, 0x20000000L); case 79: case 111: - return jjMoveStringLiteralDfa13_0(active0, 0x60000000000000L); + return jjMoveStringLiteralDfa13_0(active0, 0xc0000000000000L); default : break; } @@ -1016,14 +1018,14 @@ { case 77: case 109: - return jjMoveStringLiteralDfa14_0(active0, 0x20000000000000L); + return jjMoveStringLiteralDfa14_0(active0, 0x40000000000000L); case 79: case 111: - return jjMoveStringLiteralDfa14_0(active0, 0x40000000000000L); + return jjMoveStringLiteralDfa14_0(active0, 0x80000000000000L); case 83: case 115: - if ((active0 & 0x10000000L) != 0L) - return jjStartNfaWithStates_0(13, 28, 1); + if ((active0 & 0x20000000L) != 0L) + return jjStartNfaWithStates_0(13, 29, 1); break; default : break; @@ -1043,10 +1045,10 @@ { case 70: case 102: - return jjMoveStringLiteralDfa15_0(active0, 0x20000000000000L); + return jjMoveStringLiteralDfa15_0(active0, 0x40000000000000L); case 77: case 109: - return jjMoveStringLiteralDfa15_0(active0, 0x40000000000000L); + return jjMoveStringLiteralDfa15_0(active0, 0x80000000000000L); default : break; } @@ -1065,10 +1067,10 @@ { case 70: case 102: - return jjMoveStringLiteralDfa16_0(active0, 0x40000000000000L); + return jjMoveStringLiteralDfa16_0(active0, 0x80000000000000L); case 73: case 105: - return jjMoveStringLiteralDfa16_0(active0, 0x20000000000000L); + return jjMoveStringLiteralDfa16_0(active0, 0x40000000000000L); default : break; } @@ -1087,10 +1089,10 @@ { case 73: case 105: - return jjMoveStringLiteralDfa17_0(active0, 0x40000000000000L); + return jjMoveStringLiteralDfa17_0(active0, 0x80000000000000L); case 76: case 108: - return jjMoveStringLiteralDfa17_0(active0, 0x20000000000000L); + return jjMoveStringLiteralDfa17_0(active0, 0x40000000000000L); default : break; } @@ -1109,10 +1111,10 @@ { case 76: case 108: - return jjMoveStringLiteralDfa18_0(active0, 0x40000000000000L); + return jjMoveStringLiteralDfa18_0(active0, 0x80000000000000L); case 84: case 116: - return jjMoveStringLiteralDfa18_0(active0, 0x20000000000000L); + return jjMoveStringLiteralDfa18_0(active0, 0x40000000000000L); default : break; } @@ -1131,10 +1133,10 @@ { case 69: case 101: - return jjMoveStringLiteralDfa19_0(active0, 0x20000000000000L); + return jjMoveStringLiteralDfa19_0(active0, 0x40000000000000L); case 84: case 116: - return jjMoveStringLiteralDfa19_0(active0, 0x40000000000000L); + return jjMoveStringLiteralDfa19_0(active0, 0x80000000000000L); default : break; } @@ -1153,11 +1155,11 @@ { case 69: case 101: - return jjMoveStringLiteralDfa20_0(active0, 0x40000000000000L); + return jjMoveStringLiteralDfa20_0(active0, 0x80000000000000L); case 82: case 114: - if ((active0 & 0x20000000000000L) != 0L) - return jjStartNfaWithStates_0(19, 53, 1); + if ((active0 & 0x40000000000000L) != 0L) + return jjStartNfaWithStates_0(19, 54, 1); break; default : break; @@ -1177,8 +1179,8 @@ { case 82: case 114: - if ((active0 & 0x40000000000000L) != 0L) - return jjStartNfaWithStates_0(20, 54, 1); + if ((active0 & 0x80000000000000L) != 0L) + return jjStartNfaWithStates_0(20, 55, 1); break; default : break; @@ -1240,14 +1242,14 @@ case 0: if ((0x3ff000000000000L & l) != 0L) { - if (kind > 66) - kind = 66; + if (kind > 67) + kind = 67; jjCheckNAddStates(0, 6); } else if ((0x400a00000000000L & l) != 0L) { - if (kind > 65) - kind = 65; + if (kind > 66) + kind = 66; jjCheckNAdd(1); } else if (curChar == 39) @@ -1260,8 +1262,8 @@ case 1: if ((0x7ffa00000000000L & l) == 0L) break; - if (kind > 65) - kind = 65; + if (kind > 66) + kind = 66; jjCheckNAdd(1); break; case 2: @@ -1271,8 +1273,8 @@ case 3: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 67) - kind = 67; + if (kind > 68) + kind = 68; jjCheckNAddTwoStates(3, 4); break; case 5: @@ -1282,8 +1284,8 @@ case 6: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 67) - kind = 67; + if (kind > 68) + kind = 68; jjCheckNAdd(6); break; case 7: @@ -1295,8 +1297,8 @@ jjCheckNAddTwoStates(8, 9); break; case 9: - if (curChar == 34 && kind > 69) - kind = 69; + if (curChar == 34 && kind > 70) + kind = 70; break; case 10: if (curChar == 39) @@ -1319,21 +1321,21 @@ jjCheckNAddStates(10, 12); break; case 15: - if (curChar == 39 && kind > 70) - kind = 70; + if (curChar == 39 && kind > 71) + kind = 71; break; case 16: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 66) - kind = 66; + if (kind > 67) + kind = 67; jjCheckNAddStates(0, 6); break; case 17: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 66) - kind = 66; + if (kind > 67) + kind = 67; jjCheckNAdd(17); break; case 18: @@ -1347,8 +1349,8 @@ case 20: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 67) - kind = 67; + if (kind > 68) + kind = 68; jjCheckNAddTwoStates(20, 21); break; case 22: @@ -1358,8 +1360,8 @@ case 23: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 67) - kind = 67; + if (kind > 68) + kind = 68; jjCheckNAdd(23); break; case 24: @@ -1373,15 +1375,15 @@ case 27: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 67) - kind = 67; + if (kind > 68) + kind = 68; jjCheckNAdd(27); break; case 28: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 67) - kind = 67; + if (kind > 68) + kind = 68; jjCheckNAddTwoStates(28, 29); break; case 30: @@ -1391,8 +1393,8 @@ case 31: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 67) - kind = 67; + if (kind > 68) + kind = 68; jjCheckNAdd(31); break; default : break; @@ -1410,8 +1412,8 @@ case 1: if ((0x47fffffe87fffffeL & l) == 0L) break; - if (kind > 65) - kind = 65; + if (kind > 66) + kind = 66; jjCheckNAdd(1); break; case 4: @@ -1487,15 +1489,15 @@ 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, null, null, -null, null, null, null, null, null, null, "\54", "\56", "\50", "\51", "\75", "\76", -"\74", null, null, "\41\75", "\52", null, null, null, null, null, null, null, null, +null, null, null, null, null, null, null, null, "\54", "\56", "\50", "\51", "\75", +"\76", "\74", null, null, "\41\75", "\52", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, -null, null, null, null, "\73", }; +null, null, null, null, null, "\73", }; public static final String[] lexStateNames = { "DEFAULT", }; static final long[] jjtoToken = { - 0xffffffffffffffe1L, 0xefL, + 0xffffffffffffffe1L, 0x1dfL, }; static final long[] jjtoSkip = { 0x1eL, 0x0L, Index: src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserConstants.java =================================================================== --- src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserConstants.java (revision 606712) +++ src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserConstants.java (working copy) @@ -12,64 +12,65 @@ int DESC = 10; int CREATE = 11; int DROP = 12; - int FS = 13; - int JAR = 14; - int EXIT = 15; - int INSERT = 16; - int INTO = 17; - int TABLE = 18; - int DELETE = 19; - int SELECT = 20; - int ENABLE = 21; - int DISABLE = 22; - int STARTING = 23; - int WHERE = 24; - int FROM = 25; - int ROW = 26; - int VALUES = 27; - int COLUMNFAMILIES = 28; - int TIMESTAMP = 29; - int NUM_VERSIONS = 30; - int LIMIT = 31; - int AND = 32; - int OR = 33; - int COMMA = 34; - int DOT = 35; - int LPAREN = 36; - int RPAREN = 37; - int EQUALS = 38; - int LCOMP = 39; - int RCOMP = 40; - int NOT = 41; - int IN = 42; - int NOTEQUAL = 43; - int ASTERISK = 44; - int MAX_VERSIONS = 45; - int MAX_LENGTH = 46; - int COMPRESSION = 47; - int NONE = 48; - int BLOCK = 49; - int RECORD = 50; - int IN_MEMORY = 51; - int BLOOMFILTER = 52; - int COUNTING_BLOOMFILTER = 53; - int RETOUCHED_BLOOMFILTER = 54; - int VECTOR_SIZE = 55; - int NUM_HASH = 56; - int NUM_ENTRIES = 57; - int ADD = 58; - int CHANGE = 59; - int META_TABLE = 60; - int ROOT_TABLE = 61; - int SAVE = 62; - int GROUP = 63; - int BY = 64; - int ID = 65; - int INTEGER_LITERAL = 66; - int FLOATING_POINT_LITERAL = 67; - int EXPONENT = 68; - int QUOTED_IDENTIFIER = 69; - int STRING_LITERAL = 70; + int TRUNCATE = 13; + int FS = 14; + int JAR = 15; + int EXIT = 16; + int INSERT = 17; + int INTO = 18; + int TABLE = 19; + int DELETE = 20; + int SELECT = 21; + int ENABLE = 22; + int DISABLE = 23; + int STARTING = 24; + int WHERE = 25; + int FROM = 26; + int ROW = 27; + int VALUES = 28; + int COLUMNFAMILIES = 29; + int TIMESTAMP = 30; + int NUM_VERSIONS = 31; + int LIMIT = 32; + int AND = 33; + int OR = 34; + int COMMA = 35; + int DOT = 36; + int LPAREN = 37; + int RPAREN = 38; + int EQUALS = 39; + int LCOMP = 40; + int RCOMP = 41; + int NOT = 42; + int IN = 43; + int NOTEQUAL = 44; + int ASTERISK = 45; + int MAX_VERSIONS = 46; + int MAX_LENGTH = 47; + int COMPRESSION = 48; + int NONE = 49; + int BLOCK = 50; + int RECORD = 51; + int IN_MEMORY = 52; + int BLOOMFILTER = 53; + int COUNTING_BLOOMFILTER = 54; + int RETOUCHED_BLOOMFILTER = 55; + int VECTOR_SIZE = 56; + int NUM_HASH = 57; + int NUM_ENTRIES = 58; + int ADD = 59; + int CHANGE = 60; + int META_TABLE = 61; + int ROOT_TABLE = 62; + int SAVE = 63; + int GROUP = 64; + int BY = 65; + int ID = 66; + int INTEGER_LITERAL = 67; + int FLOATING_POINT_LITERAL = 68; + int EXPONENT = 69; + int QUOTED_IDENTIFIER = 70; + int STRING_LITERAL = 71; int DEFAULT = 0; @@ -87,6 +88,7 @@ "\"desc\"", "\"create\"", "\"drop\"", + "\"truncate\"", "\"fs\"", "\"jar\"", "\"exit\"", Index: src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/Parser.java =================================================================== --- src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/Parser.java (revision 606712) +++ src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/Parser.java (working copy) @@ -67,6 +67,7 @@ case DESC: case CREATE: case DROP: + case TRUNCATE: case FS: case JAR: case EXIT: @@ -77,7 +78,7 @@ case DISABLE: case SAVE: case ID: - case 71: + case 72: switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case HELP: case ALTER: @@ -87,6 +88,7 @@ case DESC: case CREATE: case DROP: + case TRUNCATE: case FS: case JAR: case EXIT: @@ -103,7 +105,7 @@ jj_la1[0] = jj_gen; ; } - jj_consume_token(71); + jj_consume_token(72); break; case 0: jj_consume_token(0); @@ -139,6 +141,9 @@ case DROP: cmd = dropCommand(); break; + case TRUNCATE: + cmd = truncateCommand(); + break; case ALTER: cmd = alterCommand(); break; @@ -436,7 +441,7 @@ case MAX_VERSIONS: jj_consume_token(MAX_VERSIONS); jj_consume_token(EQUALS); - n = Number(); + n = number(); if(n < 0) { n = Integer.MAX_VALUE; } @@ -445,7 +450,7 @@ case MAX_LENGTH: jj_consume_token(MAX_LENGTH); jj_consume_token(EQUALS); - n = Number(); + n = number(); columnSpec.put("MAX_LENGTH", n); break; case COMPRESSION: @@ -495,19 +500,19 @@ case VECTOR_SIZE: jj_consume_token(VECTOR_SIZE); jj_consume_token(EQUALS); - n = Number(); + n = number(); columnSpec.put("VECTOR_SIZE", n); break; case NUM_HASH: jj_consume_token(NUM_HASH); jj_consume_token(EQUALS); - n = Number(); + n = number(); columnSpec.put("NUM_HASH", n); break; case NUM_ENTRIES: jj_consume_token(NUM_ENTRIES); jj_consume_token(EQUALS); - n = Number(); + n = number(); columnSpec.put("NUM_ENTRIES", n); break; default: @@ -628,6 +633,28 @@ throw new Error("Missing return statement in function"); } + final public TruncateCommand truncateCommand() throws ParseException { + TruncateCommand truncate = new TruncateCommand(this.out); + String tableName = null; + jj_consume_token(TRUNCATE); + jj_consume_token(TABLE); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case META_TABLE: + case ROOT_TABLE: + case ID: + case QUOTED_IDENTIFIER: + case STRING_LITERAL: + tableName = identifier(); + break; + default: + jj_la1[19] = jj_gen; + ; + } + truncate.setTableName(tableName); + {if (true) return truncate;} + throw new Error("Missing return statement in function"); + } + final public InsertCommand insertCommand() throws ParseException { InsertCommand in = new InsertCommand(this.out); List columnfamilies = null; @@ -654,7 +681,7 @@ t = jj_consume_token(QUOTED_IDENTIFIER); break; default: - jj_la1[19] = jj_gen; + jj_la1[20] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -687,14 +714,14 @@ t = jj_consume_token(QUOTED_IDENTIFIER); break; default: - jj_la1[20] = jj_gen; + jj_la1[21] = jj_gen; jj_consume_token(-1); throw new ParseException(); } deleteCommand.setRow(t.image.substring(1, t.image.length()-1)); break; default: - jj_la1[21] = jj_gen; + jj_la1[22] = jj_gen; ; } {if (true) return deleteCommand;} @@ -730,7 +757,7 @@ jj_consume_token(FROM); break; default: - jj_la1[22] = jj_gen; + jj_la1[23] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -738,7 +765,7 @@ select.setRowKey(rowKey); break; default: - jj_la1[23] = jj_gen; + jj_la1[24] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -748,25 +775,25 @@ select.setTimestamp(timestamp); break; default: - jj_la1[24] = jj_gen; + jj_la1[25] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case NUM_VERSIONS: jj_consume_token(NUM_VERSIONS); jj_consume_token(EQUALS); - numVersion = Number(); + numVersion = number(); select.setVersion(numVersion); break; default: - jj_la1[25] = jj_gen; + jj_la1[26] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LIMIT: jj_consume_token(LIMIT); jj_consume_token(EQUALS); - limit = Number(); + limit = number(); try{ select.setLimit(limit); }catch(ClassCastException ce) { @@ -774,7 +801,7 @@ } break; default: - jj_la1[26] = jj_gen; + jj_la1[27] = jj_gen; ; } {if (true) return select;} @@ -855,7 +882,7 @@ } break; default: - jj_la1[27] = jj_gen; + jj_la1[28] = jj_gen; ; } break; @@ -881,7 +908,7 @@ substitute.setCondition(condition); break; default: - jj_la1[28] = jj_gen; + jj_la1[29] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -922,7 +949,7 @@ ; break; default: - jj_la1[29] = jj_gen; + jj_la1[30] = jj_gen; break label_7; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -945,14 +972,14 @@ jj_consume_token(QUOTED_IDENTIFIER); break; default: - jj_la1[30] = jj_gen; + jj_la1[31] = jj_gen; jj_consume_token(-1); throw new ParseException(); } values.removeAll(values); break; default: - jj_la1[31] = jj_gen; + jj_la1[32] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -972,7 +999,7 @@ s = jj_consume_token(QUOTED_IDENTIFIER); break; default: - jj_la1[32] = jj_gen; + jj_la1[33] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -998,7 +1025,7 @@ col = jj_consume_token(ASTERISK); break; default: - jj_la1[33] = jj_gen; + jj_la1[34] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1014,14 +1041,14 @@ col = jj_consume_token(STRING_LITERAL); break; default: - jj_la1[34] = jj_gen; + jj_la1[35] = jj_gen; jj_consume_token(-1); throw new ParseException(); } {if (true) return col.image.substring(1,col.image.toString().length() - 1);} break; default: - jj_la1[35] = jj_gen; + jj_la1[36] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1041,7 +1068,7 @@ ; break; default: - jj_la1[36] = jj_gen; + jj_la1[37] = jj_gen; break label_8; } jj_consume_token(COMMA); @@ -1065,7 +1092,7 @@ ; break; default: - jj_la1[37] = jj_gen; + jj_la1[38] = jj_gen; break label_9; } jj_consume_token(COMMA); @@ -1092,7 +1119,7 @@ ; break; default: - jj_la1[38] = jj_gen; + jj_la1[39] = jj_gen; break label_10; } jj_consume_token(COMMA); @@ -1103,7 +1130,7 @@ throw new Error("Missing return statement in function"); } - final public int Number() throws ParseException { + final public int number() throws ParseException { Token t = null; Token minusSignedInt = null; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1114,7 +1141,7 @@ t = jj_consume_token(INTEGER_LITERAL); break; default: - jj_la1[39] = jj_gen; + jj_la1[40] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1143,7 +1170,7 @@ t = jj_consume_token(ROOT_TABLE); break; default: - jj_la1[40] = jj_gen; + jj_la1[41] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1159,14 +1186,14 @@ t = jj_consume_token(STRING_LITERAL); break; default: - jj_la1[41] = jj_gen; + jj_la1[42] = jj_gen; jj_consume_token(-1); throw new ParseException(); } {if (true) return t.image.substring(1,t.image.toString().length() - 1);} break; default: - jj_la1[42] = jj_gen; + jj_la1[43] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1191,7 +1218,7 @@ ; break; default: - jj_la1[43] = jj_gen; + jj_la1[44] = jj_gen; break label_11; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1204,7 +1231,7 @@ connector = " OR "; break; default: - jj_la1[44] = jj_gen; + jj_la1[45] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1248,13 +1275,13 @@ searchName += ".ROW"; break; default: - jj_la1[45] = jj_gen; + jj_la1[46] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[46] = jj_gen; + jj_la1[47] = jj_gen; ; } comparator = getComparator(); @@ -1284,13 +1311,13 @@ comparand += "." + joinColumn.image.toString(); break; default: - jj_la1[47] = jj_gen; + jj_la1[48] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[48] = jj_gen; + jj_la1[49] = jj_gen; ; } break; @@ -1310,7 +1337,7 @@ } break; default: - jj_la1[49] = jj_gen; + jj_la1[50] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1339,7 +1366,7 @@ comparator += "="; break; default: - jj_la1[50] = jj_gen; + jj_la1[51] = jj_gen; ; } break; @@ -1352,7 +1379,7 @@ comparator += "="; break; default: - jj_la1[51] = jj_gen; + jj_la1[52] = jj_gen; ; } break; @@ -1365,7 +1392,7 @@ comparator = ">" + comparator; break; default: - jj_la1[52] = jj_gen; + jj_la1[53] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1374,7 +1401,7 @@ comparator = "<" + comparator; break; default: - jj_la1[53] = jj_gen; + jj_la1[54] = jj_gen; ; } break; @@ -1392,7 +1419,7 @@ comparator = "=="; break; default: - jj_la1[54] = jj_gen; + jj_la1[55] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1414,36 +1441,36 @@ finally { jj_save(0, xla); } } - final private boolean jj_3R_12() { + final private boolean jj_3R_14() { Token xsp; xsp = jj_scanpos; - if (jj_3R_13()) { + if (jj_scan_token(70)) { jj_scanpos = xsp; - if (jj_3R_14()) return true; + if (jj_scan_token(71)) return true; } return false; } - final private boolean jj_3R_14() { + final private boolean jj_3R_13() { Token xsp; xsp = jj_scanpos; - if (jj_scan_token(69)) { + if (jj_scan_token(66)) { jj_scanpos = xsp; - if (jj_scan_token(70)) return true; + if (jj_scan_token(61)) { + jj_scanpos = xsp; + if (jj_scan_token(62)) return true; } + } return false; } - final private boolean jj_3R_13() { + final private boolean jj_3R_12() { Token xsp; xsp = jj_scanpos; - if (jj_scan_token(65)) { + if (jj_3R_13()) { jj_scanpos = xsp; - if (jj_scan_token(60)) { - jj_scanpos = xsp; - if (jj_scan_token(61)) return true; + if (jj_3R_14()) return true; } - } return false; } @@ -1462,7 +1489,7 @@ public boolean lookingAhead = false; private boolean jj_semLA; private int jj_gen; - final private int[] jj_la1 = new int[55]; + final private int[] jj_la1 = new int[56]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -1472,13 +1499,13 @@ jj_la1_2(); } private static void jj_la1_0() { - jj_la1_0 = new int[] {0x79ffe0,0x79ffe1,0x79ffe0,0x0,0x0,0x0,0x0,0x0,0x19fbc0,0x19fbc0,0x0,0x600,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x1000000,0x1800000,0x1800000,0x20000000,0x40000000,0x80000000,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x0,0x4000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; + jj_la1_0 = new int[] {0xf3ffe0,0xf3ffe1,0xf3ffe0,0x0,0x0,0x0,0x0,0x0,0x33dbc0,0x33dbc0,0x0,0x600,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x2000000,0x3000000,0x3000000,0x40000000,0x80000000,0x0,0x0,0x80000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x8000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; } private static void jj_la1_1() { - jj_la1_1 = new int[] {0x40000000,0x40000000,0x40000000,0x0,0x8,0x8,0x0,0x0,0xc0000000,0xc0000000,0x30000000,0x0,0x398e000,0x70000,0x700000,0x398e000,0x4,0x4,0xc000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x80000000,0x4,0x0,0x4,0x0,0x1000,0x0,0x1000,0x4,0x4,0x4,0x0,0x30000000,0x0,0x30000000,0x3,0x3,0x0,0x8,0x0,0x8,0x10,0x40,0x40,0x80,0x100,0xfc0,}; + jj_la1_1 = new int[] {0x80000000,0x80000000,0x80000000,0x0,0x10,0x10,0x0,0x0,0x80000000,0x80000000,0x60000000,0x0,0x731c000,0xe0000,0xe00000,0x731c000,0x8,0x8,0x18000000,0x60000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x2,0x0,0x8,0x0,0x8,0x0,0x2000,0x0,0x2000,0x8,0x8,0x8,0x0,0x60000000,0x0,0x60000000,0x6,0x6,0x0,0x10,0x0,0x10,0x20,0x80,0x80,0x100,0x200,0x1f80,}; } private static void jj_la1_2() { - jj_la1_2 = new int[] {0x2,0x82,0x2,0x2,0xe,0xe,0xe,0xe,0x2,0x2,0x62,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x60,0x60,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x62,0x62,0x62,0x60,0x6,0x60,0x66,0x0,0x0,0x0,0x6,0x2,0x60,0x62,0x0,0x0,0x2,0x0,0x2,0x0,0x46,0x0,0x0,0x0,0x0,0x0,}; + jj_la1_2 = new int[] {0x4,0x104,0x4,0x4,0x1c,0x1c,0x1c,0x1c,0x5,0x5,0xc4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc4,0xc0,0xc0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x5,0xc4,0xc4,0xc4,0xc0,0xc,0xc0,0xcc,0x0,0x0,0x0,0xc,0x4,0xc0,0xc4,0x0,0x0,0x4,0x0,0x4,0x0,0x8c,0x0,0x0,0x0,0x0,0x0,}; } final private JJCalls[] jj_2_rtns = new JJCalls[1]; private boolean jj_rescan = false; @@ -1493,7 +1520,7 @@ token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 55; i++) jj_la1[i] = -1; + for (int i = 0; i < 56; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -1506,7 +1533,7 @@ token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 55; i++) jj_la1[i] = -1; + for (int i = 0; i < 56; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -1516,7 +1543,7 @@ token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 55; i++) jj_la1[i] = -1; + for (int i = 0; i < 56; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -1526,7 +1553,7 @@ token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 55; i++) jj_la1[i] = -1; + for (int i = 0; i < 56; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -1535,7 +1562,7 @@ token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 55; i++) jj_la1[i] = -1; + for (int i = 0; i < 56; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -1544,7 +1571,7 @@ token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 55; i++) jj_la1[i] = -1; + for (int i = 0; i < 56; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -1655,15 +1682,15 @@ public ParseException generateParseException() { jj_expentries.removeAllElements(); - boolean[] la1tokens = new boolean[72]; - for (int i = 0; i < 72; i++) { + boolean[] la1tokens = new boolean[73]; + for (int i = 0; i < 73; i++) { la1tokens[i] = false; } if (jj_kind >= 0) { la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 55; i++) { + for (int i = 0; i < 56; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1<