From 4404e14c16c64e5599e739cac7ede0e48e7f98e1 Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Mon, 17 Sep 2007 02:57:31 +0000 Subject: [PATCH] HADOOP-1856 [Hbaseshell] Jar command using Hadoop RunJar util git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk/src/contrib/hbase@576239 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES.txt | 2 + src/java/org/apache/hadoop/hbase/Shell.java | 7 +- .../apache/hadoop/hbase/shell/HBaseShell.jj | 24 +- .../hadoop/hbase/shell/HelpContents.java | 5 +- .../hadoop/hbase/shell/generated/Parser.java | 178 +++-- .../shell/generated/ParserConstants.java | 96 +-- .../shell/generated/ParserTokenManager.java | 668 +++++++++--------- 7 files changed, 531 insertions(+), 449 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index cf5f737b161..f6daa0e29c6 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -67,6 +67,8 @@ Trunk (unreleased changes) (Izaak Rubin via Stack) HADOOP-1868 Make default configuration more responsive HADOOP-1884 Remove useless debugging log messages from hbase.mapred + HADOOP-1856 Add Jar command to hbase shell using Hadoop RunJar util + (Edward Yoon via Stack) Below are the list of changes before 2007-08-18 diff --git a/src/java/org/apache/hadoop/hbase/Shell.java b/src/java/org/apache/hadoop/hbase/Shell.java index 4a04452791c..5b114f131fa 100644 --- a/src/java/org/apache/hadoop/hbase/Shell.java +++ b/src/java/org/apache/hadoop/hbase/Shell.java @@ -68,9 +68,10 @@ public class Shell { } } catch (ParseException pe) { String[] msg = pe.getMessage().split("[\n]"); - System.out.println("Syntax error : Type 'help' for usage: " + msg[0]); + System.out.println("Syntax error : Type 'help;' for usage.\nMessage : " + msg[0]); } catch (TokenMgrError te) { - System.out.println("Lexical error : Type 'help' for usage."); + String[] msg = te.getMessage().split("[\n]"); + System.out.println("Lexical error : Type 'help;' for usage.\nMessage : " + msg[0]); } long end = System.currentTimeMillis(); @@ -105,4 +106,4 @@ public class Shell { "(" + String.format("%.2f", (end - start) * 0.001) + " sec)" : ""; } -} \ No newline at end of file +} diff --git a/src/java/org/apache/hadoop/hbase/shell/HBaseShell.jj b/src/java/org/apache/hadoop/hbase/shell/HBaseShell.jj index f79be7e0d68..a43db9a7450 100644 --- a/src/java/org/apache/hadoop/hbase/shell/HBaseShell.jj +++ b/src/java/org/apache/hadoop/hbase/shell/HBaseShell.jj @@ -72,6 +72,7 @@ TOKEN: /** for HQL statements */ | | | + | | | | @@ -117,7 +118,7 @@ TOKEN: /** for HQL statements */ TOKEN : /** Literals */ { - + | | )? @@ -164,6 +165,7 @@ Command cmdStatement() : | cmd = disableCommand() | cmd = clearCommand() | cmd = fsCommand() + | cmd = jarCommand() ) { return cmd; @@ -197,6 +199,25 @@ FsCommand fsCommand() : } } +JarCommand jarCommand() : +{ + Token t = null; + JarCommand jar = new JarCommand(); + List query = new ArrayList(); +} +{ + + ( + ( t = | t = ) + { query.add(t.image.toString()); } + )* + + { + jar.setQuery(query); + return jar; + } +} + HelpCommand helpCommand() : { Token t = null; @@ -218,6 +239,7 @@ HelpCommand helpCommand() : | t= | t= | t= + | t= | t= ) { argument = t.image.toString(); } ] diff --git a/src/java/org/apache/hadoop/hbase/shell/HelpContents.java b/src/java/org/apache/hadoop/hbase/shell/HelpContents.java index 9fd50dac492..9621131f9cb 100644 --- a/src/java/org/apache/hadoop/hbase/shell/HelpContents.java +++ b/src/java/org/apache/hadoop/hbase/shell/HelpContents.java @@ -37,9 +37,12 @@ public class HelpContents { load.put("SHOW", new String[] {"List all available tables", "SHOW TABLES;"}); - load.put("FS", new String[] { "Hadoop FsShell operations.", + load.put("FS", new String[] { "Hadoop FsShell operations", "FS -copyFromLocal /home/user/backup.dat fs/user/backup;" }); + load.put("JAR", new String[] { "Hadoop RunJar util", + "JAR ./build/hadoop-examples.jar pi 10 10;" }); + load.put("CLEAR", new String[] {"Clear the screen", "CLEAR;"} ); load.put("DESCRIBE", new String[] { "Print information about tables", diff --git a/src/java/org/apache/hadoop/hbase/shell/generated/Parser.java b/src/java/org/apache/hadoop/hbase/shell/generated/Parser.java index 1c9d0fe9cdb..b9e4daed077 100644 --- a/src/java/org/apache/hadoop/hbase/shell/generated/Parser.java +++ b/src/java/org/apache/hadoop/hbase/shell/generated/Parser.java @@ -60,13 +60,14 @@ public class Parser implements ParserConstants { case CREATE: case DROP: case FS: + case JAR: case EXIT: case INSERT: case DELETE: case SELECT: case ENABLE: case DISABLE: - case 61: + case 62: switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case HELP: case ALTER: @@ -77,6 +78,7 @@ public class Parser implements ParserConstants { case CREATE: case DROP: case FS: + case JAR: case EXIT: case INSERT: case DELETE: @@ -89,7 +91,7 @@ public class Parser implements ParserConstants { jj_la1[0] = jj_gen; ; } - jj_consume_token(61); + jj_consume_token(62); break; case 0: jj_consume_token(0); @@ -149,6 +151,9 @@ public class Parser implements ParserConstants { case FS: cmd = fsCommand(); break; + case JAR: + cmd = jarCommand(); + break; default: jj_la1[2] = jj_gen; jj_consume_token(-1); @@ -188,6 +193,41 @@ public class Parser implements ParserConstants { throw new Error("Missing return statement in function"); } + final public JarCommand jarCommand() throws ParseException { + Token t = null; + JarCommand jar = new JarCommand(); + List query = new ArrayList(); + jj_consume_token(JAR); + label_2: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case ID: + case INTEGER_LITERAL: + ; + break; + default: + jj_la1[4] = jj_gen; + break label_2; + } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case ID: + t = jj_consume_token(ID); + break; + case INTEGER_LITERAL: + t = jj_consume_token(INTEGER_LITERAL); + break; + default: + jj_la1[5] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + query.add(t.image.toString()); + } + jar.setQuery(query); + {if (true) return jar;} + throw new Error("Missing return statement in function"); + } + final public HelpCommand helpCommand() throws ParseException { Token t = null; HelpCommand help = new HelpCommand(); @@ -201,6 +241,7 @@ public class Parser implements ParserConstants { case CREATE: case DROP: case FS: + case JAR: case EXIT: case INSERT: case DELETE: @@ -240,18 +281,21 @@ public class Parser implements ParserConstants { case FS: t = jj_consume_token(FS); break; + case JAR: + t = jj_consume_token(JAR); + break; case ID: t = jj_consume_token(ID); break; default: - jj_la1[4] = jj_gen; + jj_la1[6] = jj_gen; jj_consume_token(-1); throw new ParseException(); } argument = t.image.toString(); break; default: - jj_la1[5] = jj_gen; + jj_la1[7] = jj_gen; ; } help.setArgument(argument); @@ -270,7 +314,7 @@ public class Parser implements ParserConstants { argument = Identifier(); break; default: - jj_la1[6] = jj_gen; + jj_la1[8] = jj_gen; ; } show.setArgument(argument); @@ -289,7 +333,7 @@ public class Parser implements ParserConstants { jj_consume_token(DESC); break; default: - jj_la1[7] = jj_gen; + jj_la1[9] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -303,7 +347,7 @@ public class Parser implements ParserConstants { Map columnSpec = new HashMap(); int n = -1; Token t = null; - label_2: + label_3: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case MAX_VERSIONS: @@ -317,8 +361,8 @@ public class Parser implements ParserConstants { ; break; default: - jj_la1[8] = jj_gen; - break label_2; + jj_la1[10] = jj_gen; + break label_3; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case MAX_VERSIONS: @@ -347,7 +391,7 @@ public class Parser implements ParserConstants { t = jj_consume_token(RECORD); break; default: - jj_la1[9] = jj_gen; + jj_la1[11] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -371,7 +415,7 @@ public class Parser implements ParserConstants { t = jj_consume_token(RETOUCHED_BLOOMFILTER); break; default: - jj_la1[10] = jj_gen; + jj_la1[12] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -396,7 +440,7 @@ public class Parser implements ParserConstants { columnSpec.put("NUM_ENTRIES", n); break; default: - jj_la1[11] = jj_gen; + jj_la1[13] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -418,15 +462,15 @@ public class Parser implements ParserConstants { column = Identifier(); columnSpec = ColumnSpec(); createCommand.addColumnSpec(column, columnSpec); - label_3: + label_4: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: ; break; default: - jj_la1[12] = jj_gen; - break label_3; + jj_la1[14] = jj_gen; + break label_4; } jj_consume_token(COMMA); column = Identifier(); @@ -462,15 +506,15 @@ public class Parser implements ParserConstants { column = Identifier(); columnSpec = ColumnSpec(); alterCommand.addColumnSpec(column, columnSpec); - label_4: + label_5: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: ; break; default: - jj_la1[13] = jj_gen; - break label_4; + jj_la1[15] = jj_gen; + break label_5; } jj_consume_token(COMMA); column = Identifier(); @@ -493,7 +537,7 @@ public class Parser implements ParserConstants { alterCommand.addColumnSpec(column, columnSpec); break; default: - jj_la1[14] = jj_gen; + jj_la1[16] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -539,7 +583,7 @@ public class Parser implements ParserConstants { t = jj_consume_token(QUOTED_IDENTIFIER); break; default: - jj_la1[15] = jj_gen; + jj_la1[17] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -570,7 +614,7 @@ public class Parser implements ParserConstants { t = jj_consume_token(QUOTED_IDENTIFIER); break; default: - jj_la1[16] = jj_gen; + jj_la1[18] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -608,7 +652,7 @@ public class Parser implements ParserConstants { jj_consume_token(FROM); break; default: - jj_la1[17] = jj_gen; + jj_la1[19] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -616,7 +660,7 @@ public class Parser implements ParserConstants { select.setRowKey(rowKey); break; default: - jj_la1[18] = jj_gen; + jj_la1[20] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -626,7 +670,7 @@ public class Parser implements ParserConstants { select.setTimestamp(timestamp); break; default: - jj_la1[19] = jj_gen; + jj_la1[21] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -636,7 +680,7 @@ public class Parser implements ParserConstants { select.setVersion(numVersion); break; default: - jj_la1[20] = jj_gen; + jj_la1[22] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -651,7 +695,7 @@ public class Parser implements ParserConstants { } break; default: - jj_la1[21] = jj_gen; + jj_la1[23] = jj_gen; ; } {if (true) return select;} @@ -693,7 +737,7 @@ public class Parser implements ParserConstants { jj_consume_token(LPAREN); literal = getStringLiteral(); if(literal != null) values.add(literal); - label_5: + label_6: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: @@ -703,8 +747,8 @@ public class Parser implements ParserConstants { ; break; default: - jj_la1[22] = jj_gen; - break label_5; + jj_la1[24] = jj_gen; + break label_6; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: @@ -726,14 +770,14 @@ public class Parser implements ParserConstants { jj_consume_token(QUOTED_IDENTIFIER); break; default: - jj_la1[23] = jj_gen; + jj_la1[25] = jj_gen; jj_consume_token(-1); throw new ParseException(); } values.removeAll(values); break; default: - jj_la1[24] = jj_gen; + jj_la1[26] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -753,7 +797,7 @@ public class Parser implements ParserConstants { s = jj_consume_token(QUOTED_IDENTIFIER); break; default: - jj_la1[25] = jj_gen; + jj_la1[27] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -768,15 +812,15 @@ public class Parser implements ParserConstants { jj_consume_token(LPAREN); literal = getColumn(); if(literal != null) values.add(literal); - label_6: + label_7: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: ; break; default: - jj_la1[26] = jj_gen; - break label_6; + jj_la1[28] = jj_gen; + break label_7; } jj_consume_token(COMMA); literal = getColumn(); @@ -800,7 +844,7 @@ public class Parser implements ParserConstants { col = jj_consume_token(ASTERISK); break; default: - jj_la1[27] = jj_gen; + jj_la1[29] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -816,14 +860,14 @@ public class Parser implements ParserConstants { col = jj_consume_token(STRING_LITERAL); break; default: - jj_la1[28] = jj_gen; + jj_la1[30] = 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[29] = jj_gen; + jj_la1[31] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -835,15 +879,15 @@ public class Parser implements ParserConstants { String table = null; table = Identifier(); tableList.add(table); - label_7: + label_8: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: ; break; default: - jj_la1[30] = jj_gen; - break label_7; + jj_la1[32] = jj_gen; + break label_8; } jj_consume_token(COMMA); table = Identifier(); @@ -862,15 +906,15 @@ public class Parser implements ParserConstants { } else { {if (true) return columnList;} } - label_8: + label_9: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: ; break; default: - jj_la1[31] = jj_gen; - break label_8; + jj_la1[33] = jj_gen; + break label_9; } jj_consume_token(COMMA); column = getColumn(); @@ -904,14 +948,14 @@ public class Parser implements ParserConstants { t = jj_consume_token(STRING_LITERAL); break; default: - jj_la1[32] = jj_gen; + jj_la1[34] = 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[33] = jj_gen; + jj_la1[35] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -925,33 +969,33 @@ public class Parser implements ParserConstants { finally { jj_save(0, xla); } } - final private boolean jj_3R_9() { + final private boolean jj_3R_10() { Token xsp; xsp = jj_scanpos; - if (jj_3R_10()) { + if (jj_3R_11()) { jj_scanpos = xsp; - if (jj_3R_11()) return true; + if (jj_3R_12()) return true; } return false; } final private boolean jj_3_1() { if (jj_scan_token(ADD)) return true; - if (jj_3R_9()) return true; + if (jj_3R_10()) return true; return false; } - final private boolean jj_3R_11() { + final private boolean jj_3R_12() { Token xsp; xsp = jj_scanpos; - if (jj_scan_token(59)) { + if (jj_scan_token(60)) { jj_scanpos = xsp; - if (jj_scan_token(60)) return true; + if (jj_scan_token(61)) return true; } return false; } - final private boolean jj_3R_10() { + final private boolean jj_3R_11() { if (jj_scan_token(ID)) return true; return false; } @@ -965,7 +1009,7 @@ public class Parser implements ParserConstants { public boolean lookingAhead = false; private boolean jj_semLA; private int jj_gen; - final private int[] jj_la1 = new int[34]; + final private int[] jj_la1 = new int[36]; static private int[] jj_la1_0; static private int[] jj_la1_1; static { @@ -973,10 +1017,10 @@ public class Parser implements ParserConstants { jj_la1_1(); } private static void jj_la1_0() { - jj_la1_0 = new int[] {0x3cffe0,0x3cffe1,0x3cffe0,0x0,0xcfbc0,0xcfbc0,0x0,0x600,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0xc00000,0xc00000,0x10000000,0x20000000,0x40000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; + jj_la1_0 = new int[] {0x79ffe0,0x79ffe1,0x79ffe0,0x0,0x0,0x0,0x19fbc0,0x19fbc0,0x0,0x600,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x1800000,0x1800000,0x20000000,0x40000000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; } private static void jj_la1_1() { - jj_la1_1 = new int[] {0x0,0x20000000,0x0,0x800000,0x800000,0x800000,0x18800000,0x0,0x1cc700,0x3800,0x38000,0x1cc700,0x2,0x2,0x600000,0x18000000,0x18000000,0x0,0x0,0x0,0x0,0x0,0x18800002,0x18800000,0x18800002,0x18000000,0x2,0x800080,0x18000000,0x18800080,0x2,0x2,0x18000000,0x18800000,}; + jj_la1_1 = new int[] {0x0,0x40000000,0x0,0x1000000,0x3000000,0x3000000,0x1000000,0x1000000,0x31000000,0x0,0x398e00,0x7000,0x70000,0x398e00,0x4,0x4,0xc00000,0x30000000,0x30000000,0x0,0x0,0x0,0x0,0x0,0x31000004,0x31000000,0x31000004,0x30000000,0x4,0x1000100,0x30000000,0x31000100,0x4,0x4,0x30000000,0x31000000,}; } final private JJCalls[] jj_2_rtns = new JJCalls[1]; private boolean jj_rescan = false; @@ -991,7 +1035,7 @@ public class Parser implements ParserConstants { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 34; i++) jj_la1[i] = -1; + for (int i = 0; i < 36; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -1004,7 +1048,7 @@ public class Parser implements ParserConstants { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 34; i++) jj_la1[i] = -1; + for (int i = 0; i < 36; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -1014,7 +1058,7 @@ public class Parser implements ParserConstants { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 34; i++) jj_la1[i] = -1; + for (int i = 0; i < 36; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -1024,7 +1068,7 @@ public class Parser implements ParserConstants { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 34; i++) jj_la1[i] = -1; + for (int i = 0; i < 36; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -1033,7 +1077,7 @@ public class Parser implements ParserConstants { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 34; i++) jj_la1[i] = -1; + for (int i = 0; i < 36; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -1042,7 +1086,7 @@ public class Parser implements ParserConstants { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 34; i++) jj_la1[i] = -1; + for (int i = 0; i < 36; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -1153,15 +1197,15 @@ public class Parser implements ParserConstants { public ParseException generateParseException() { jj_expentries.removeAllElements(); - boolean[] la1tokens = new boolean[62]; - for (int i = 0; i < 62; i++) { + boolean[] la1tokens = new boolean[63]; + for (int i = 0; i < 63; i++) { la1tokens[i] = false; } if (jj_kind >= 0) { la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 34; i++) { + for (int i = 0; i < 36; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1< 56) + kind = 56; + jjCheckNAdd(0); + } + if ((0x3ff000000000000L & l) != 0L) + { + if (kind > 58) + kind = 58; + jjCheckNAddTwoStates(2, 3); + } + break; + case 1: + if ((0x7ffe00000000000L & l) != 0L) + { + if (kind > 56) + kind = 56; + jjCheckNAdd(0); + } + else if (curChar == 39) + jjCheckNAddStates(0, 2); + else if (curChar == 34) + jjCheckNAdd(7); if ((0x3ff000000000000L & l) != 0L) { if (kind > 57) kind = 57; - jjCheckNAddTwoStates(2, 3); + jjCheckNAddStates(3, 9); } - else if ((0x400e00000000000L & l) != 0L) - { - if (kind > 55) - kind = 55; - jjCheckNAdd(0); - } - break; - case 1: - if ((0x3ff000000000000L & l) != 0L) - { - if (kind > 56) - kind = 56; - jjCheckNAddStates(0, 6); - } - else if ((0x400e00000000000L & l) != 0L) - { - if (kind > 55) - kind = 55; - jjCheckNAdd(0); - } - else if (curChar == 39) - jjCheckNAddStates(7, 9); - else if (curChar == 34) - jjCheckNAdd(7); - if (curChar == 46) + else if (curChar == 46) jjCheckNAdd(2); break; case 0: - if ((0x400e00000000000L & l) == 0L) + if ((0x7ffe00000000000L & l) == 0L) break; - if (kind > 55) - kind = 55; + if (kind > 56) + kind = 56; jjCheckNAdd(0); break; case 2: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 57) - kind = 57; + if (kind > 58) + kind = 58; jjCheckNAddTwoStates(2, 3); break; case 4: @@ -1232,8 +1240,8 @@ private final int jjMoveNfa_0(int startState, int curPos) case 5: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 57) - kind = 57; + if (kind > 58) + kind = 58; jjCheckNAdd(5); break; case 6: @@ -1245,16 +1253,16 @@ private final int jjMoveNfa_0(int startState, int curPos) jjCheckNAddTwoStates(7, 8); break; case 8: - if (curChar == 34 && kind > 59) - kind = 59; + if (curChar == 34 && kind > 60) + kind = 60; break; case 9: if (curChar == 39) - jjCheckNAddStates(7, 9); + jjCheckNAddStates(0, 2); break; case 10: if ((0xffffff7fffffffffL & l) != 0L) - jjCheckNAddStates(7, 9); + jjCheckNAddStates(0, 2); break; case 11: if (curChar == 39) @@ -1269,21 +1277,21 @@ private final int jjMoveNfa_0(int startState, int curPos) jjCheckNAddStates(10, 12); break; case 14: - if (curChar == 39 && kind > 60) - kind = 60; + if (curChar == 39 && kind > 61) + kind = 61; break; case 15: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 56) - kind = 56; - jjCheckNAddStates(0, 6); + if (kind > 57) + kind = 57; + jjCheckNAddStates(3, 9); break; case 16: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 56) - kind = 56; + if (kind > 57) + kind = 57; jjCheckNAdd(16); break; case 17: @@ -1297,8 +1305,8 @@ private final int jjMoveNfa_0(int startState, int curPos) case 19: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 57) - kind = 57; + if (kind > 58) + kind = 58; jjCheckNAddTwoStates(19, 20); break; case 21: @@ -1308,8 +1316,8 @@ private final int jjMoveNfa_0(int startState, int curPos) case 22: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 57) - kind = 57; + if (kind > 58) + kind = 58; jjCheckNAdd(22); break; case 23: @@ -1323,15 +1331,15 @@ private final int jjMoveNfa_0(int startState, int curPos) case 26: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 57) - kind = 57; + if (kind > 58) + kind = 58; jjCheckNAdd(26); break; case 27: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 57) - kind = 57; + if (kind > 58) + kind = 58; jjCheckNAddTwoStates(27, 28); break; case 29: @@ -1341,8 +1349,8 @@ private final int jjMoveNfa_0(int startState, int curPos) case 30: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 57) - kind = 57; + if (kind > 58) + kind = 58; jjCheckNAdd(30); break; default : break; @@ -1360,15 +1368,15 @@ private final int jjMoveNfa_0(int startState, int curPos) case 0: if ((0x7fffffe87fffffeL & l) == 0L) break; - if (kind > 55) - kind = 55; + if (kind > 56) + kind = 56; jjCheckNAdd(0); break; case 1: if ((0x7fffffe87fffffeL & l) == 0L) break; - if (kind > 55) - kind = 55; + if (kind > 56) + kind = 56; jjCheckNAdd(0); break; case 3: @@ -1379,7 +1387,7 @@ private final int jjMoveNfa_0(int startState, int curPos) jjAddStates(15, 16); break; case 10: - jjCheckNAddStates(7, 9); + jjCheckNAddStates(0, 2); break; case 13: jjCheckNAddStates(10, 12); @@ -1414,7 +1422,7 @@ private final int jjMoveNfa_0(int startState, int curPos) break; case 10: if ((jjbitVec0[i2] & l2) != 0L) - jjCheckNAddStates(7, 9); + jjCheckNAddStates(0, 2); break; case 13: if ((jjbitVec0[i2] & l2) != 0L) @@ -1438,20 +1446,20 @@ private final int jjMoveNfa_0(int startState, int curPos) } } static final int[] jjnextStates = { - 16, 17, 18, 23, 24, 27, 28, 10, 12, 14, 12, 13, 14, 4, 5, 7, + 10, 12, 14, 16, 17, 18, 23, 24, 27, 28, 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, 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", }; +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 = { - 0x3bffffffffffffe1L, + 0x77ffffffffffffe1L, }; static final long[] jjtoSkip = { 0x1eL,