HADOOP-1607 [hbase shell] Clear screen command.

A src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/ClearCommand.java
    Added.
M src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/HBaseShell.jj
    Add 'clear' command handling.
    (clearCommand): Added.
M src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/Parser.java
M src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserConstants.java
M src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserTokenManager.java
    Add 'clear' command handling (Generated by javacc).
M src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/HelpContents.java
    Add 'CLEAR' help.
M src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/HelpManager.java
    Clear screen before outputting version string.


git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@556356 13f79535-47bb-0310-9956-ffa450edef68

src/contrib/hbase/CHANGES.txt

@@ -61,3 +61,4 @@ Trunk (unreleased changes)
  37. HADOOP-1589 Exception handling in HBase is broken over client server
  38. HADOOP-1574 Concurrent creates of a table named 'X' all succeed
  39. HADOOP-1581 Un-openable tablename bug
+ 40. HADOOP-1607 [shell] Clear screen command (Edward Yoon via Stack)

src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/ClearCommand.java

@@ -0,0 +1,46 @@
+/**
+ * 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 java.io.IOException;
+
+import org.apache.hadoop.hbase.HClient;
+
+public class ClearCommand extends BasicCommand {
+
+  public ReturnMsg execute(HClient client) {
+    clear();
+    return null;
+  }
+
+  static void clear() {
+    String osName = System.getProperty("os.name");
+    if (osName.length() > 7 && osName.subSequence(0, 7).equals("Windows")) {
+      try {
+        Runtime.getRuntime().exec("cls");
+      } catch (IOException e) {
+        System.out.println("Can't clear." + e.toString());
+      }
+    } else {
+      System.out.print("\033c");
+    }
+  }
+
+}

src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/HBaseShell.jj

@@ -63,6 +63,7 @@ SKIP :
 TOKEN:
 {
    <HELP: "help">
+ | <CLEAR: "clear">
  | <SHOW: "show">
  | <DESCRIBE: "describe">
  | <CREATE: "create">	
@@ -127,6 +128,7 @@ Command cmdStatement() :
      | cmd = insertCommand()
      | cmd = deleteCommand()
      | cmd = selectCommand()
+     | cmd = clearCommand()
   )
    {
        return cmd;
@@ -159,6 +161,7 @@ HelpCommand helpCommand() :
        | t=<INSERT>
        | t=<DELETE>
        | t=<SELECT>
+       | t=<CLEAR>
        | t=<ID>
      ) { argument = t.image.toString(); }
    ]
@@ -345,6 +348,14 @@ SelectCommand selectCommand() :
   { return select; }
 }
 
+ClearCommand clearCommand() :
+{
+  ClearCommand clear = new ClearCommand();
+}
+{
+   <CLEAR>  { return clear; }
+}
+
 /**
 * TODO : expressions codes need more love.
 */

src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/HelpContents.java

@@ -31,6 +31,7 @@ public class HelpContents {
     Map<String, String[]> load = new HashMap<String, String[]>();
 
     load.put("SHOW", new String[] { "List all tables.", "SHOW TABLES;" });
+    load.put("CLEAR", new String[] {"Clear the screen.", "CLEAR;"} );
     load.put("DESCRIBE", new String[] { "Describe a table's columnfamilies.",
         "DESCRIBE <table_name>;" });
     load.put("CREATE", new String[] {

src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/HelpManager.java

@@ -41,7 +41,8 @@ public class HelpManager {
 
   /** Print out the program version. */
   public void printVersion() {
-    System.out.println("\n" + APP_NAME + ", " + APP_VERSION + " version.\n"
+    ClearCommand.clear();
+    System.out.println(APP_NAME + ", " + APP_VERSION + " version.\n"
         + "Copyright (c) 2007 by udanax, "
         + "licensed to Apache Software Foundation.\n"
         + "Type 'help;' for usage.\n");

src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/Parser.java

@@ -51,6 +51,7 @@ public class Parser implements ParserConstants {
     Command statement = null;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case HELP:
+    case CLEAR:
     case SHOW:
     case DESCRIBE:
     case CREATE:
@@ -59,9 +60,10 @@ public class Parser implements ParserConstants {
     case INSERT:
     case DELETE:
     case SELECT:
-    case 35:
+    case 36:
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case HELP:
+      case CLEAR:
       case SHOW:
       case DESCRIBE:
       case CREATE:
@@ -76,7 +78,7 @@ public class Parser implements ParserConstants {
         jj_la1[0] = jj_gen;
         ;
       }
-      jj_consume_token(35);
+      jj_consume_token(36);
       break;
     case 0:
       jj_consume_token(0);
@@ -120,6 +122,9 @@ public class Parser implements ParserConstants {
     case SELECT:
       cmd = selectCommand();
       break;
+    case CLEAR:
+      cmd = clearCommand();
+      break;
     default:
       jj_la1[2] = jj_gen;
       jj_consume_token(-1);
@@ -142,6 +147,7 @@ public class Parser implements ParserConstants {
   String argument = "";
     jj_consume_token(HELP);
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case CLEAR:
     case SHOW:
     case DESCRIBE:
     case CREATE:
@@ -176,6 +182,9 @@ public class Parser implements ParserConstants {
       case SELECT:
         t = jj_consume_token(SELECT);
         break;
+      case CLEAR:
+        t = jj_consume_token(CLEAR);
+        break;
       case ID:
         t = jj_consume_token(ID);
         break;
@@ -298,8 +307,8 @@ public class Parser implements ParserConstants {
         try{
            in.setCondition(cond);
         }catch(ClassCastException ce) {
-            {if (true) throw generateParseException();}
-     }
+           {if (true) throw generateParseException();}
+        }
        {if (true) return in;}
     throw new Error("Missing return statement in function");
   }
@@ -317,7 +326,7 @@ public class Parser implements ParserConstants {
            del.setCondition(cond);
         }catch(ClassCastException ce) {
             {if (true) throw generateParseException();}
-        }
+       }
        {if (true) return del;}
     throw new Error("Missing return statement in function");
   }
@@ -363,6 +372,13 @@ public class Parser implements ParserConstants {
     throw new Error("Missing return statement in function");
   }
 
+  final public ClearCommand clearCommand() throws ParseException {
+  ClearCommand clear = new ClearCommand();
+    jj_consume_token(CLEAR);
+              {if (true) return clear;}
+    throw new Error("Missing return statement in function");
+  }
+
 /**
 * TODO : expressions codes need more love.
 */
@@ -380,7 +396,7 @@ public class Parser implements ParserConstants {
       jj_consume_token(-1);
       throw new ParseException();
     }
-        {if (true) return t.image.toString();}
+      {if (true) return t.image.toString();}
     throw new Error("Missing return statement in function");
   }
 
@@ -591,10 +607,10 @@ public class Parser implements ParserConstants {
       jj_la1_1();
    }
    private static void jj_la1_0() {
-      jj_la1_0 = new int[] {0x3fe0,0x3fe1,0x3fe0,0x40003fc0,0x40003fc0,0x40000000,0x40000000,0x100000,0x40000000,0x80000,0x100000,0x40000000,0x200000,0x4007c000,0x18000000,0x0,0x40800000,0x40000000,0x40800000,0x0,};
+      jj_la1_0 = new int[] {0x7fe0,0x7fe1,0x7fe0,0x80007fc0,0x80007fc0,0x80000000,0x80000000,0x200000,0x80000000,0x100000,0x200000,0x80000000,0x400000,0x800f8000,0x30000000,0x0,0x81000000,0x80000000,0x81000000,0x0,};
    }
    private static void jj_la1_1() {
-      jj_la1_1 = new int[] {0x0,0x8,0x0,0x0,0x0,0x2,0x2,0x0,0x2,0x0,0x0,0x2,0x0,0x0,0x0,0x6,0x7,0x7,0x7,0x6,};
+      jj_la1_1 = new int[] {0x0,0x10,0x0,0x0,0x0,0x4,0x4,0x0,0x4,0x0,0x0,0x4,0x0,0x0,0x0,0xc,0xe,0xe,0xe,0xc,};
    }
 
   public Parser(java.io.InputStream stream) {
@@ -699,8 +715,8 @@ public class Parser implements ParserConstants {
 
   public ParseException generateParseException() {
     jj_expentries.removeAllElements();
-    boolean[] la1tokens = new boolean[36];
-    for (int i = 0; i < 36; i++) {
+    boolean[] la1tokens = new boolean[37];
+    for (int i = 0; i < 37; i++) {
       la1tokens[i] = false;
     }
     if (jj_kind >= 0) {
@@ -719,7 +735,7 @@ public class Parser implements ParserConstants {
         }
       }
     }
-    for (int i = 0; i < 36; i++) {
+    for (int i = 0; i < 37; i++) {
       if (la1tokens[i]) {
         jj_expentry = new int[1];
         jj_expentry[0] = i;

src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserConstants.java

@@ -24,35 +24,36 @@ public interface ParserConstants {
 
   int EOF = 0;
   int HELP = 5;
-  int SHOW = 6;
-  int DESCRIBE = 7;
-  int CREATE = 8;
-  int DROP = 9;
-  int EXIT = 10;
-  int INSERT = 11;
-  int DELETE = 12;
-  int SELECT = 13;
-  int ROW = 14;
-  int COLUMN = 15;
-  int TIME = 16;
-  int VALUES = 17;
-  int COLUMNFAMILIES = 18;
-  int WHERE = 19;
-  int LIMIT = 20;
-  int AND = 21;
-  int OR = 22;
-  int COMMA = 23;
-  int DOT = 24;
-  int LPAREN = 25;
-  int RPAREN = 26;
-  int EQUALS = 27;
-  int NOTEQUAL = 28;
-  int OPTIONS = 29;
-  int ID = 30;
-  int NUM = 31;
-  int STRING = 32;
-  int QUOTED_STRING = 33;
-  int STRING_LITERAL = 34;
+  int CLEAR = 6;
+  int SHOW = 7;
+  int DESCRIBE = 8;
+  int CREATE = 9;
+  int DROP = 10;
+  int EXIT = 11;
+  int INSERT = 12;
+  int DELETE = 13;
+  int SELECT = 14;
+  int ROW = 15;
+  int COLUMN = 16;
+  int TIME = 17;
+  int VALUES = 18;
+  int COLUMNFAMILIES = 19;
+  int WHERE = 20;
+  int LIMIT = 21;
+  int AND = 22;
+  int OR = 23;
+  int COMMA = 24;
+  int DOT = 25;
+  int LPAREN = 26;
+  int RPAREN = 27;
+  int EQUALS = 28;
+  int NOTEQUAL = 29;
+  int OPTIONS = 30;
+  int ID = 31;
+  int NUM = 32;
+  int STRING = 33;
+  int QUOTED_STRING = 34;
+  int STRING_LITERAL = 35;
 
   int DEFAULT = 0;
 
@@ -63,6 +64,7 @@ public interface ParserConstants {
     "\"\\r\"",
     "\"\\n\"",
     "\"help\"",
+    "\"clear\"",
     "\"show\"",
     "\"describe\"",
     "\"create\"",

src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserTokenManager.java

@@ -36,121 +36,121 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0)
    switch (pos)
    {
       case 0:
-         if ((active0 & 0x20000000L) != 0L)
-            return 1;
-         if ((active0 & 0x7fffe0L) != 0L)
+         if ((active0 & 0xffffe0L) != 0L)
          {
-            jjmatchedKind = 30;
+            jjmatchedKind = 31;
             return 13;
          }
+         if ((active0 & 0x40000000L) != 0L)
+            return 1;
          return -1;
       case 1:
-         if ((active0 & 0x3fffe0L) != 0L)
+         if ((active0 & 0x7fffe0L) != 0L)
          {
-            jjmatchedKind = 30;
+            jjmatchedKind = 31;
             jjmatchedPos = 1;
             return 13;
          }
-         if ((active0 & 0x400000L) != 0L)
+         if ((active0 & 0x800000L) != 0L)
             return 13;
          return -1;
       case 2:
-         if ((active0 & 0x204000L) != 0L)
+         if ((active0 & 0x408000L) != 0L)
             return 13;
-         if ((active0 & 0x1fbfe0L) != 0L)
+         if ((active0 & 0x3f7fe0L) != 0L)
          {
-            jjmatchedKind = 30;
+            jjmatchedKind = 31;
             jjmatchedPos = 2;
             return 13;
          }
          return -1;
       case 3:
-         if ((active0 & 0x10660L) != 0L)
-            return 13;
-         if ((active0 & 0x1eb980L) != 0L)
+         if ((active0 & 0x3d7340L) != 0L)
          {
-            jjmatchedKind = 30;
+            jjmatchedKind = 31;
             jjmatchedPos = 3;
             return 13;
          }
+         if ((active0 & 0x20ca0L) != 0L)
+            return 13;
          return -1;
       case 4:
-         if ((active0 & 0x6b980L) != 0L)
+         if ((active0 & 0x300040L) != 0L)
+            return 13;
+         if ((active0 & 0xd7300L) != 0L)
          {
-            jjmatchedKind = 30;
+            jjmatchedKind = 31;
             jjmatchedPos = 4;
             return 13;
          }
-         if ((active0 & 0x180000L) != 0L)
-            return 13;
          return -1;
       case 5:
-         if ((active0 & 0x6b900L) != 0L)
+         if ((active0 & 0xd7200L) != 0L)
             return 13;
-         if ((active0 & 0x80L) != 0L)
+         if ((active0 & 0x100L) != 0L)
          {
             if (jjmatchedPos != 5)
             {
-               jjmatchedKind = 30;
+               jjmatchedKind = 31;
                jjmatchedPos = 5;
             }
             return 13;
          }
          return -1;
       case 6:
-         if ((active0 & 0x40080L) != 0L)
+         if ((active0 & 0x80100L) != 0L)
          {
-            jjmatchedKind = 30;
+            jjmatchedKind = 31;
             jjmatchedPos = 6;
             return 13;
          }
          return -1;
       case 7:
-         if ((active0 & 0x80L) != 0L)
+         if ((active0 & 0x100L) != 0L)
             return 13;
-         if ((active0 & 0x40000L) != 0L)
+         if ((active0 & 0x80000L) != 0L)
          {
-            jjmatchedKind = 30;
+            jjmatchedKind = 31;
             jjmatchedPos = 7;
             return 13;
          }
          return -1;
       case 8:
-         if ((active0 & 0x40000L) != 0L)
+         if ((active0 & 0x80000L) != 0L)
          {
-            jjmatchedKind = 30;
+            jjmatchedKind = 31;
             jjmatchedPos = 8;
             return 13;
          }
          return -1;
       case 9:
-         if ((active0 & 0x40000L) != 0L)
+         if ((active0 & 0x80000L) != 0L)
          {
-            jjmatchedKind = 30;
+            jjmatchedKind = 31;
             jjmatchedPos = 9;
             return 13;
          }
          return -1;
       case 10:
-         if ((active0 & 0x40000L) != 0L)
+         if ((active0 & 0x80000L) != 0L)
          {
-            jjmatchedKind = 30;
+            jjmatchedKind = 31;
             jjmatchedPos = 10;
             return 13;
          }
          return -1;
       case 11:
-         if ((active0 & 0x40000L) != 0L)
+         if ((active0 & 0x80000L) != 0L)
          {
-            jjmatchedKind = 30;
+            jjmatchedKind = 31;
             jjmatchedPos = 11;
             return 13;
          }
          return -1;
       case 12:
-         if ((active0 & 0x40000L) != 0L)
+         if ((active0 & 0x80000L) != 0L)
          {
-            jjmatchedKind = 30;
+            jjmatchedKind = 31;
             jjmatchedPos = 12;
             return 13;
          }
@@ -182,60 +182,60 @@ private final int jjMoveStringLiteralDfa0_0()
    switch(curChar)
    {
       case 40:
-         return jjStopAtPos(0, 25);
-      case 41:
          return jjStopAtPos(0, 26);
+      case 41:
+         return jjStopAtPos(0, 27);
       case 44:
-         return jjStopAtPos(0, 23);
+         return jjStopAtPos(0, 24);
       case 45:
-         return jjStartNfaWithStates_0(0, 29, 1);
+         return jjStartNfaWithStates_0(0, 30, 1);
       case 46:
-         return jjStopAtPos(0, 24);
+         return jjStopAtPos(0, 25);
       case 59:
-         return jjStopAtPos(0, 35);
+         return jjStopAtPos(0, 36);
       case 60:
-         return jjMoveStringLiteralDfa1_0(0x10000000L);
+         return jjMoveStringLiteralDfa1_0(0x20000000L);
       case 61:
-         return jjStopAtPos(0, 27);
+         return jjStopAtPos(0, 28);
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa1_0(0x200000L);
+         return jjMoveStringLiteralDfa1_0(0x400000L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa1_0(0x48100L);
+         return jjMoveStringLiteralDfa1_0(0x90240L);
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa1_0(0x1280L);
+         return jjMoveStringLiteralDfa1_0(0x2500L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa1_0(0x400L);
+         return jjMoveStringLiteralDfa1_0(0x800L);
       case 72:
       case 104:
          return jjMoveStringLiteralDfa1_0(0x20L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa1_0(0x800L);
+         return jjMoveStringLiteralDfa1_0(0x1000L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa1_0(0x100000L);
+         return jjMoveStringLiteralDfa1_0(0x200000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa1_0(0x400000L);
+         return jjMoveStringLiteralDfa1_0(0x800000L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa1_0(0x4000L);
+         return jjMoveStringLiteralDfa1_0(0x8000L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa1_0(0x2040L);
+         return jjMoveStringLiteralDfa1_0(0x4080L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa1_0(0x10000L);
+         return jjMoveStringLiteralDfa1_0(0x20000L);
       case 86:
       case 118:
-         return jjMoveStringLiteralDfa1_0(0x20000L);
+         return jjMoveStringLiteralDfa1_0(0x40000L);
       case 87:
       case 119:
-         return jjMoveStringLiteralDfa1_0(0x80000L);
+         return jjMoveStringLiteralDfa1_0(0x100000L);
       default :
          return jjMoveNfa_0(0, 0);
    }
@@ -250,35 +250,38 @@ private final int jjMoveStringLiteralDfa1_0(long active0)
    switch(curChar)
    {
       case 62:
-         if ((active0 & 0x10000000L) != 0L)
-            return jjStopAtPos(1, 28);
+         if ((active0 & 0x20000000L) != 0L)
+            return jjStopAtPos(1, 29);
          break;
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa2_0(active0, 0x20000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x40000L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa2_0(active0, 0x30a0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x6120L);
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa2_0(active0, 0x80040L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x100080L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa2_0(active0, 0x110000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x220000L);
+      case 76:
+      case 108:
+         return jjMoveStringLiteralDfa2_0(active0, 0x40L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa2_0(active0, 0x200800L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x401000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa2_0(active0, 0x4c000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x98000L);
       case 82:
       case 114:
-         if ((active0 & 0x400000L) != 0L)
-            return jjStartNfaWithStates_0(1, 22, 13);
-         return jjMoveStringLiteralDfa2_0(active0, 0x300L);
+         if ((active0 & 0x800000L) != 0L)
+            return jjStartNfaWithStates_0(1, 23, 13);
+         return jjMoveStringLiteralDfa2_0(active0, 0x600L);
       case 88:
       case 120:
-         return jjMoveStringLiteralDfa2_0(active0, 0x400L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x800L);
       default :
          break;
    }
@@ -297,31 +300,31 @@ private final int jjMoveStringLiteralDfa2_0(long old0, long active0)
    {
       case 68:
       case 100:
-         if ((active0 & 0x200000L) != 0L)
-            return jjStartNfaWithStates_0(2, 21, 13);
+         if ((active0 & 0x400000L) != 0L)
+            return jjStartNfaWithStates_0(2, 22, 13);
          break;
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa3_0(active0, 0x80100L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x100240L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa3_0(active0, 0x400L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x800L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa3_0(active0, 0x6b020L);
+         return jjMoveStringLiteralDfa3_0(active0, 0xd6020L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa3_0(active0, 0x110000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x220000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa3_0(active0, 0x240L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x480L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa3_0(active0, 0x880L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1100L);
       case 87:
       case 119:
-         if ((active0 & 0x4000L) != 0L)
-            return jjStartNfaWithStates_0(2, 14, 13);
+         if ((active0 & 0x8000L) != 0L)
+            return jjStartNfaWithStates_0(2, 15, 13);
          break;
       default :
          break;
@@ -341,40 +344,40 @@ private final int jjMoveStringLiteralDfa3_0(long old0, long active0)
    {
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa4_0(active0, 0x100L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x240L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa4_0(active0, 0x80L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x100L);
       case 69:
       case 101:
-         if ((active0 & 0x10000L) != 0L)
-            return jjStartNfaWithStates_0(3, 16, 13);
-         return jjMoveStringLiteralDfa4_0(active0, 0x3800L);
+         if ((active0 & 0x20000L) != 0L)
+            return jjStartNfaWithStates_0(3, 17, 13);
+         return jjMoveStringLiteralDfa4_0(active0, 0x7000L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa4_0(active0, 0x100000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x200000L);
       case 80:
       case 112:
          if ((active0 & 0x20L) != 0L)
             return jjStartNfaWithStates_0(3, 5, 13);
-         else if ((active0 & 0x200L) != 0L)
-            return jjStartNfaWithStates_0(3, 9, 13);
+         else if ((active0 & 0x400L) != 0L)
+            return jjStartNfaWithStates_0(3, 10, 13);
          break;
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa4_0(active0, 0x80000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x100000L);
       case 84:
       case 116:
-         if ((active0 & 0x400L) != 0L)
-            return jjStartNfaWithStates_0(3, 10, 13);
+         if ((active0 & 0x800L) != 0L)
+            return jjStartNfaWithStates_0(3, 11, 13);
          break;
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa4_0(active0, 0x68000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0xd0000L);
       case 87:
       case 119:
-         if ((active0 & 0x40L) != 0L)
-            return jjStartNfaWithStates_0(3, 6, 13);
+         if ((active0 & 0x80L) != 0L)
+            return jjStartNfaWithStates_0(3, 7, 13);
          break;
       default :
          break;
@@ -394,23 +397,25 @@ private final int jjMoveStringLiteralDfa4_0(long old0, long active0)
    {
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa5_0(active0, 0x2000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x4000L);
       case 69:
       case 101:
-         if ((active0 & 0x80000L) != 0L)
-            return jjStartNfaWithStates_0(4, 19, 13);
-         return jjMoveStringLiteralDfa5_0(active0, 0x20000L);
+         if ((active0 & 0x100000L) != 0L)
+            return jjStartNfaWithStates_0(4, 20, 13);
+         return jjMoveStringLiteralDfa5_0(active0, 0x40000L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa5_0(active0, 0x48000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x90000L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa5_0(active0, 0x880L);
+         if ((active0 & 0x40L) != 0L)
+            return jjStartNfaWithStates_0(4, 6, 13);
+         return jjMoveStringLiteralDfa5_0(active0, 0x1100L);
       case 84:
       case 116:
-         if ((active0 & 0x100000L) != 0L)
-            return jjStartNfaWithStates_0(4, 20, 13);
-         return jjMoveStringLiteralDfa5_0(active0, 0x1100L);
+         if ((active0 & 0x200000L) != 0L)
+            return jjStartNfaWithStates_0(4, 21, 13);
+         return jjMoveStringLiteralDfa5_0(active0, 0x2200L);
       default :
          break;
    }
@@ -429,33 +434,33 @@ private final int jjMoveStringLiteralDfa5_0(long old0, long active0)
    {
       case 69:
       case 101:
-         if ((active0 & 0x100L) != 0L)
-            return jjStartNfaWithStates_0(5, 8, 13);
-         else if ((active0 & 0x1000L) != 0L)
-            return jjStartNfaWithStates_0(5, 12, 13);
+         if ((active0 & 0x200L) != 0L)
+            return jjStartNfaWithStates_0(5, 9, 13);
+         else if ((active0 & 0x2000L) != 0L)
+            return jjStartNfaWithStates_0(5, 13, 13);
          break;
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa6_0(active0, 0x80L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x100L);
       case 78:
       case 110:
-         if ((active0 & 0x8000L) != 0L)
+         if ((active0 & 0x10000L) != 0L)
          {
-            jjmatchedKind = 15;
+            jjmatchedKind = 16;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x40000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x80000L);
       case 83:
       case 115:
-         if ((active0 & 0x20000L) != 0L)
-            return jjStartNfaWithStates_0(5, 17, 13);
+         if ((active0 & 0x40000L) != 0L)
+            return jjStartNfaWithStates_0(5, 18, 13);
          break;
       case 84:
       case 116:
-         if ((active0 & 0x800L) != 0L)
-            return jjStartNfaWithStates_0(5, 11, 13);
-         else if ((active0 & 0x2000L) != 0L)
-            return jjStartNfaWithStates_0(5, 13, 13);
+         if ((active0 & 0x1000L) != 0L)
+            return jjStartNfaWithStates_0(5, 12, 13);
+         else if ((active0 & 0x4000L) != 0L)
+            return jjStartNfaWithStates_0(5, 14, 13);
          break;
       default :
          break;
@@ -475,10 +480,10 @@ private final int jjMoveStringLiteralDfa6_0(long old0, long active0)
    {
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa7_0(active0, 0x80L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x100L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa7_0(active0, 0x40000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x80000L);
       default :
          break;
    }
@@ -497,11 +502,11 @@ private final int jjMoveStringLiteralDfa7_0(long old0, long active0)
    {
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa8_0(active0, 0x40000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x80000L);
       case 69:
       case 101:
-         if ((active0 & 0x80L) != 0L)
-            return jjStartNfaWithStates_0(7, 7, 13);
+         if ((active0 & 0x100L) != 0L)
+            return jjStartNfaWithStates_0(7, 8, 13);
          break;
       default :
          break;
@@ -521,7 +526,7 @@ private final int jjMoveStringLiteralDfa8_0(long old0, long active0)
    {
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa9_0(active0, 0x40000L);
+         return jjMoveStringLiteralDfa9_0(active0, 0x80000L);
       default :
          break;
    }
@@ -540,7 +545,7 @@ private final int jjMoveStringLiteralDfa9_0(long old0, long active0)
    {
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa10_0(active0, 0x40000L);
+         return jjMoveStringLiteralDfa10_0(active0, 0x80000L);
       default :
          break;
    }
@@ -559,7 +564,7 @@ private final int jjMoveStringLiteralDfa10_0(long old0, long active0)
    {
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa11_0(active0, 0x40000L);
+         return jjMoveStringLiteralDfa11_0(active0, 0x80000L);
       default :
          break;
    }
@@ -578,7 +583,7 @@ private final int jjMoveStringLiteralDfa11_0(long old0, long active0)
    {
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa12_0(active0, 0x40000L);
+         return jjMoveStringLiteralDfa12_0(active0, 0x80000L);
       default :
          break;
    }
@@ -597,7 +602,7 @@ private final int jjMoveStringLiteralDfa12_0(long old0, long active0)
    {
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa13_0(active0, 0x40000L);
+         return jjMoveStringLiteralDfa13_0(active0, 0x80000L);
       default :
          break;
    }
@@ -616,8 +621,8 @@ private final int jjMoveStringLiteralDfa13_0(long old0, long active0)
    {
       case 83:
       case 115:
-         if ((active0 & 0x40000L) != 0L)
-            return jjStartNfaWithStates_0(13, 18, 13);
+         if ((active0 & 0x80000L) != 0L)
+            return jjStartNfaWithStates_0(13, 19, 13);
          break;
       default :
          break;
@@ -679,8 +684,8 @@ private final int jjMoveNfa_0(int startState, int curPos)
                case 0:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 32)
-                        kind = 32;
+                     if (kind > 33)
+                        kind = 33;
                      jjCheckNAdd(3);
                   }
                   else if (curChar == 39)
@@ -689,50 +694,50 @@ private final int jjMoveNfa_0(int startState, int curPos)
                      jjCheckNAdd(5);
                   else if (curChar == 45)
                   {
-                     if (kind > 30)
-                        kind = 30;
+                     if (kind > 31)
+                        kind = 31;
                      jjCheckNAdd(1);
                   }
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 31)
-                        kind = 31;
+                     if (kind > 32)
+                        kind = 32;
                      jjCheckNAdd(2);
                   }
                   break;
                case 13:
                   if ((0x3ff200000000000L & l) != 0L)
                   {
-                     if (kind > 30)
-                        kind = 30;
+                     if (kind > 31)
+                        kind = 31;
                      jjCheckNAdd(1);
                   }
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 32)
-                        kind = 32;
+                     if (kind > 33)
+                        kind = 33;
                      jjCheckNAdd(3);
                   }
                   break;
                case 1:
                   if ((0x3ff200000000000L & l) == 0L)
                      break;
-                  if (kind > 30)
-                     kind = 30;
+                  if (kind > 31)
+                     kind = 31;
                   jjCheckNAdd(1);
                   break;
                case 2:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 31)
-                     kind = 31;
+                  if (kind > 32)
+                     kind = 32;
                   jjCheckNAdd(2);
                   break;
                case 3:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 32)
-                     kind = 32;
+                  if (kind > 33)
+                     kind = 33;
                   jjCheckNAdd(3);
                   break;
                case 4:
@@ -744,8 +749,8 @@ private final int jjMoveNfa_0(int startState, int curPos)
                      jjCheckNAddTwoStates(5, 6);
                   break;
                case 6:
-                  if (curChar == 34 && kind > 33)
-                     kind = 33;
+                  if (curChar == 34 && kind > 34)
+                     kind = 34;
                   break;
                case 7:
                   if (curChar == 39)
@@ -768,8 +773,8 @@ private final int jjMoveNfa_0(int startState, int curPos)
                      jjCheckNAddStates(3, 5);
                   break;
                case 12:
-                  if (curChar == 39 && kind > 34)
-                     kind = 34;
+                  if (curChar == 39 && kind > 35)
+                     kind = 35;
                   break;
                default : break;
             }
@@ -785,43 +790,43 @@ private final int jjMoveNfa_0(int startState, int curPos)
                case 0:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 30)
-                        kind = 30;
+                     if (kind > 31)
+                        kind = 31;
                      jjCheckNAdd(1);
                   }
                   if ((0x7fffffe07fffffeL & l) != 0L)
                   {
-                     if (kind > 32)
-                        kind = 32;
+                     if (kind > 33)
+                        kind = 33;
                      jjCheckNAdd(3);
                   }
                   break;
                case 13:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 30)
-                        kind = 30;
+                     if (kind > 31)
+                        kind = 31;
                      jjCheckNAdd(1);
                   }
                   if ((0x7fffffe07fffffeL & l) != 0L)
                   {
-                     if (kind > 32)
-                        kind = 32;
+                     if (kind > 33)
+                        kind = 33;
                      jjCheckNAdd(3);
                   }
                   break;
                case 1:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 30)
-                     kind = 30;
+                  if (kind > 31)
+                     kind = 31;
                   jjCheckNAdd(1);
                   break;
                case 3:
                   if ((0x7fffffe07fffffeL & l) == 0L)
                      break;
-                  if (kind > 32)
-                     kind = 32;
+                  if (kind > 33)
+                     kind = 33;
                   jjCheckNAdd(3);
                   break;
                case 5:
@@ -879,13 +884,13 @@ static final int[] jjnextStates = {
 };
 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, "\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, "\54", "\56", 
+"\50", "\51", "\75", "\74\76", "\55", null, null, null, null, null, "\73", };
 public static final String[] lexStateNames = {
    "DEFAULT", 
 };
 static final long[] jjtoToken = {
-   0xfffffffe1L, 
+   0x1fffffffe1L, 
 };
 static final long[] jjtoSkip = {
    0x1eL,