hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r609254 - in /lucene/hadoop/trunk/src/contrib/hbase: ./ src/java/org/apache/hadoop/hbase/ src/java/org/apache/hadoop/hbase/shell/ src/java/org/apache/hadoop/hbase/shell/generated/
Date Sun, 06 Jan 2008 04:43:56 GMT
Author: stack
Date: Sat Jan  5 20:43:54 2008
New Revision: 609254

URL: http://svn.apache.org/viewvc?rev=609254&view=rev
Log:
HADOOP-2240 Truncate for hbase

Modified:
    lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt
    lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/Shell.java
    lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/AlterCommand.java
    lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/HBaseShell.jj
    lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/HelpCommand.java
    lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/ShellSecurityManager.java
    lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/ShowCommand.java
    lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/Parser.java
    lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserConstants.java
    lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserTokenManager.java

Modified: lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt?rev=609254&r1=609253&r2=609254&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt Sat Jan  5 20:43:54 2008
@@ -20,6 +20,7 @@
                 (Bryan Duxbury via Stack)
     HADOOP-2395 Implement "ALTER TABLE ... CHANGE column" operation
                 (Bryan Duxbury via Stack)
+    HADOOP-2240 Truncate for hbase (Edward Yoon via Stack)
 
   OPTIMIZATIONS
    HADOOP-2479 Save on number of Text object creations

Modified: lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/Shell.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/Shell.java?rev=609254&r1=609253&r2=609254&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/Shell.java (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/Shell.java Sat Jan  5 20:43:54 2008
@@ -48,6 +48,7 @@
   public static String MASTER_ADDRESS = null;
   public static String HTML_OPTION = null;
   public static int RELAUNCH_FLAG = 7;
+  public static int EXIT_FLAG = 9999;
 
   /** Return the boolean value indicating whether end of command or not */
   static boolean isEndOfCommand(String line) {

Modified: lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/AlterCommand.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/AlterCommand.java?rev=609254&r1=609253&r2=609254&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/AlterCommand.java (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/AlterCommand.java Sat Jan  5 20:43:54 2008
@@ -53,6 +53,7 @@
     super(o);
   }
 
+  @SuppressWarnings("unchecked")
   public ReturnMsg execute(HBaseConfiguration conf) {
     try {
       HConnection conn = HConnectionManager.getConnection(conf);
@@ -76,34 +77,34 @@
           break;
         case DROP:
           disableTable(admin, tableName);
-          println("Dropping " + column + " from " + tableName
-              + "... Please wait.");
+          println("Dropping " + column + " from " + tableName + "... Please wait.");
           column = appendDelimiter(column);
           admin.deleteColumn(new Text(tableName), new Text(column));
           enableTable(admin, tableName);
           break;
         case CHANGE:
           disableTable(admin, tableName);
-          
-          Map.Entry<String, Map<String, Object>> columnEntry = 
-            (Map.Entry<String, Map<String, Object>>)columnSpecMap.entrySet().toArray()[0];
+
+          Map.Entry<String, Map<String, Object>> columnEntry = (Map.Entry<String, Map<String, Object>>) columnSpecMap
+              .entrySet().toArray()[0];
 
           // add the : if there isn't one
-          Text columnName = new Text(columnEntry.getKey().endsWith(":") ? 
-            columnEntry.getKey() : columnEntry.getKey() + ":");
-          
+          Text columnName = new Text(
+              columnEntry.getKey().endsWith(":") ? columnEntry.getKey()
+                  : columnEntry.getKey() + ":");
+
           // get the table descriptor so we can get the old column descriptor
           HTableDescriptor tDesc = getTableDescByName(admin, tableName);
           HColumnDescriptor oldColumnDesc = tDesc.families().get(columnName);
 
-          // combine the options specified in the shell with the options 
+          // combine the options specified in the shell with the options
           // from the exiting descriptor to produce the new descriptor
-          columnDesc = getColumnDescriptor(columnName.toString(), 
-            columnEntry.getValue(), oldColumnDesc);
-          
+          columnDesc = getColumnDescriptor(columnName.toString(), columnEntry
+              .getValue(), oldColumnDesc);
+
           // send the changes out to the master
           admin.modifyColumn(new Text(tableName), columnName, columnDesc);
-          
+
           enableTable(admin, tableName);
           break;
         case NOOP:
@@ -166,26 +167,26 @@
   public CommandType getCommandType() {
     return CommandType.DDL;
   }
-  
+
   private HTableDescriptor getTableDescByName(HBaseAdmin admin, String tableName)
-  throws IOException{
+      throws IOException {
     HTableDescriptor[] tables = admin.listTables();
-    for(HTableDescriptor tDesc : tables){
+    for (HTableDescriptor tDesc : tables) {
       if (tDesc.getName().toString().equals(tableName)) {
         return tDesc;
       }
     }
     return null;
   }
-  
+
   /**
-   * Given a column name, column spec, and original descriptor, returns an 
+   * Given a column name, column spec, and original descriptor, returns an
    * instance of HColumnDescriptor representing the column spec, with empty
    * values drawn from the original as defaults
    */
   protected HColumnDescriptor getColumnDescriptor(String column,
-    Map<String, Object> columnSpec, HColumnDescriptor original) 
-  throws IllegalArgumentException {
+      Map<String, Object> columnSpec, HColumnDescriptor original)
+      throws IllegalArgumentException {
     initOptions(original);
 
     Set<String> specs = columnSpec.keySet();
@@ -197,8 +198,8 @@
       } else if (spec.equals("MAX_LENGTH")) {
         maxLength = (Integer) columnSpec.get(spec);
       } else if (spec.equals("COMPRESSION")) {
-        compression = HColumnDescriptor.CompressionType
-            .valueOf(((String) columnSpec.get(spec)).toUpperCase());
+        compression = HColumnDescriptor.CompressionType.valueOf(((String) columnSpec
+            .get(spec)).toUpperCase());
       } else if (spec.equals("IN_MEMORY")) {
         inMemory = (Boolean) columnSpec.get(spec);
       } else if (spec.equals("BLOOMFILTER")) {
@@ -244,6 +245,4 @@
     inMemory = original.isInMemory();
     bloomFilterDesc = original.getBloomFilter();
   }
-
-  
 }

Modified: lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/HBaseShell.jj
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/HBaseShell.jj?rev=609254&r1=609253&r2=609254&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/HBaseShell.jj (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/HBaseShell.jj Sat Jan  5 20:43:54 2008
@@ -79,6 +79,7 @@
    | <DESC: "desc">
    | <CREATE: "create">   
    | <DROP: "drop">
+   | <TRUNCATE: "truncate">
    | <FS: "fs">
    | <JAR: "jar">
    | <EXIT: "exit">
@@ -171,6 +172,7 @@
       | cmd = descCommand()
       | cmd = createCommand()
       | cmd = dropCommand()
+      | cmd = truncateCommand()
       | cmd = alterCommand()
       | cmd = insertCommand()
       | cmd = deleteCommand()
@@ -218,19 +220,11 @@
   Token t = null;
   JarCommand jar = new JarCommand(this.out);
   List<String> query = new ArrayList<String>();
-  String path = "";
 }
 {
   <JAR>
   (
       ( t=<ID> | t=<INTEGER_LITERAL> | t=<FLOATING_POINT_LITERAL> )
-      { path += t.image.toString(); }
-  )*
-  t=<JAR>
-  { query.add(path + t.image.toString()); }
-  
-  (
-      ( t=<ID> | t=<INTEGER_LITERAL> | t=<FLOATING_POINT_LITERAL> )
       { query.add(t.image.toString()); }
   )*
   
@@ -240,6 +234,22 @@
   }
 }
 
+TruncateCommand truncateCommand() :
+{
+  TruncateCommand truncate = new TruncateCommand(this.out);
+  String tableName = null;
+}
+{
+  <TRUNCATE><TABLE>
+  [
+    tableName = identifier()
+  ]
+  {
+    truncate.setTableName(tableName);
+    return truncate;
+  }
+}
+
 HelpCommand helpCommand() :
 {
   Token t = null;
@@ -311,7 +321,7 @@
 {
   (
     <MAX_VERSIONS> 
-     <EQUALS> n = Number() 
+     <EQUALS> n = number() 
     { 
        if(n < 0) {
          n = Integer.MAX_VALUE;
@@ -320,7 +330,7 @@
     }
    |
     <MAX_LENGTH>
-     <EQUALS> n = Number()
+     <EQUALS> n = number()
     {  
       columnSpec.put("MAX_LENGTH", n); 
     }
@@ -350,18 +360,18 @@
     }
    |  
     <VECTOR_SIZE> 
-    <EQUALS> n = Number() 
+    <EQUALS> n = number() 
     { 
       columnSpec.put("VECTOR_SIZE", n); 
     }
    |
     <NUM_HASH>
-    <EQUALS> n = Number()
+    <EQUALS> n = number()
     { 
       columnSpec.put("NUM_HASH", n); 
     }  
    |
-    <NUM_ENTRIES> <EQUALS> n = Number()
+    <NUM_ENTRIES> <EQUALS> n = number()
     { 
       columnSpec.put("NUM_ENTRIES", n); 
     }
@@ -581,13 +591,13 @@
   ]
    
   [
-     <NUM_VERSIONS><EQUALS> numVersion = Number()
+     <NUM_VERSIONS><EQUALS> numVersion = number()
       {
         select.setVersion(numVersion);
       }
   ]
 
-  [ <LIMIT><EQUALS> limit = Number() {
+  [ <LIMIT><EQUALS> limit = number() {
       try{
         select.setLimit(limit);
       }catch(ClassCastException ce) {
@@ -746,7 +756,7 @@
   { return columnList; }
 }
 
-int Number() :
+int number() :
 {
   Token t = null;
   Token minusSignedInt = null;

Modified: lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/HelpCommand.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/HelpCommand.java?rev=609254&r1=609253&r2=609254&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/HelpCommand.java (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/HelpCommand.java Sat Jan  5 20:43:54 2008
@@ -119,6 +119,10 @@
             + "CHANGE column_family column_spec | "
             + "DROP column_family_name | " + "CHANGE column_spec;" });
 
+    load.put("TRUNCATE", new String[] {
+         "Truncate table is used to clean all data from a table",
+         "TRUNCATE TABLE table_name;" });
+    
     load.put("EXIT", new String[] { "Exit shell", "EXIT;" });
 
     return load;

Modified: lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/ShellSecurityManager.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/ShellSecurityManager.java?rev=609254&r1=609253&r2=609254&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/ShellSecurityManager.java (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/ShellSecurityManager.java Sat Jan  5 20:43:54 2008
@@ -43,7 +43,7 @@
    */
   @SuppressWarnings("static-access")
   public void checkExit(int status) {
-    if (status != 9999) {
+    if (status != Shell.EXIT_FLAG) {
       // throw new ExitException(status);
 
       // I didn't figure out How can catch the ExitException in shell main.

Modified: lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/ShowCommand.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/ShowCommand.java?rev=609254&r1=609253&r2=609254&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/ShowCommand.java (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/ShowCommand.java Sat Jan  5 20:43:54 2008
@@ -21,7 +21,6 @@
 
 import java.io.IOException;
 import java.io.Writer;
-import java.util.Map;
 
 import org.apache.hadoop.hbase.HBaseAdmin;
 import org.apache.hadoop.hbase.HBaseConfiguration;

Modified: lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/Parser.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/Parser.java?rev=609254&r1=609253&r2=609254&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/Parser.java (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/Parser.java Sat Jan  5 20:43:54 2008
@@ -67,6 +67,7 @@
     case DESC:
     case CREATE:
     case DROP:
+    case TRUNCATE:
     case FS:
     case JAR:
     case EXIT:
@@ -75,7 +76,7 @@
     case SELECT:
     case ENABLE:
     case DISABLE:
-    case 65:
+    case 66:
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case HELP:
       case ALTER:
@@ -85,6 +86,7 @@
       case DESC:
       case CREATE:
       case DROP:
+      case TRUNCATE:
       case FS:
       case JAR:
       case EXIT:
@@ -99,7 +101,7 @@
         jj_la1[0] = jj_gen;
         ;
       }
-      jj_consume_token(65);
+      jj_consume_token(66);
       break;
     case 0:
       jj_consume_token(0);
@@ -135,6 +137,9 @@
     case DROP:
       cmd = dropCommand();
       break;
+    case TRUNCATE:
+      cmd = truncateCommand();
+      break;
     case ALTER:
       cmd = alterCommand();
       break;
@@ -205,7 +210,6 @@
   Token t = null;
   JarCommand jar = new JarCommand(this.out);
   List<String> query = new ArrayList<String>();
-  String path = "";
     jj_consume_token(JAR);
     label_2:
     while (true) {
@@ -234,37 +238,6 @@
         jj_consume_token(-1);
         throw new ParseException();
       }
-        path += t.image.toString();
-    }
-    t = jj_consume_token(JAR);
-    query.add(path + t.image.toString());
-    label_3:
-    while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case ID:
-      case INTEGER_LITERAL:
-      case FLOATING_POINT_LITERAL:
-        ;
-        break;
-      default:
-        jj_la1[6] = jj_gen;
-        break label_3;
-      }
-      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;
-      case FLOATING_POINT_LITERAL:
-        t = jj_consume_token(FLOATING_POINT_LITERAL);
-        break;
-      default:
-        jj_la1[7] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
-      }
         query.add(t.image.toString());
     }
     jar.setQuery(query);
@@ -272,6 +245,26 @@
     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 ID:
+    case QUOTED_IDENTIFIER:
+    case STRING_LITERAL:
+      tableName = identifier();
+      break;
+    default:
+      jj_la1[6] = jj_gen;
+      ;
+    }
+    truncate.setTableName(tableName);
+    {if (true) return truncate;}
+    throw new Error("Missing return statement in function");
+  }
+
   final public HelpCommand helpCommand() throws ParseException {
   Token t = null;
   HelpCommand help = new HelpCommand(this.out, this.formatter);
@@ -332,14 +325,14 @@
         t = jj_consume_token(ID);
         break;
       default:
-        jj_la1[8] = jj_gen;
+        jj_la1[7] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
          argument = t.image.toString();
       break;
     default:
-      jj_la1[9] = jj_gen;
+      jj_la1[8] = jj_gen;
       ;
     }
       help.setArgument(argument);
@@ -358,7 +351,7 @@
       argument = identifier();
       break;
     default:
-      jj_la1[10] = jj_gen;
+      jj_la1[9] = jj_gen;
       ;
     }
       show.setArgument(argument);
@@ -377,7 +370,7 @@
       jj_consume_token(DESC);
       break;
     default:
-      jj_la1[11] = jj_gen;
+      jj_la1[10] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -391,7 +384,7 @@
   Map<String, Object> columnSpec = new HashMap<String, Object>();
   int n = -1;
   Token t = null;
-    label_4:
+    label_3:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case MAX_VERSIONS:
@@ -405,14 +398,14 @@
         ;
         break;
       default:
-        jj_la1[12] = jj_gen;
-        break label_4;
+        jj_la1[11] = jj_gen;
+        break label_3;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case MAX_VERSIONS:
         jj_consume_token(MAX_VERSIONS);
         jj_consume_token(EQUALS);
-        n = Number();
+        n = number();
        if(n < 0) {
          n = Integer.MAX_VALUE;
        }
@@ -421,7 +414,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:
@@ -438,7 +431,7 @@
           t = jj_consume_token(RECORD);
           break;
         default:
-          jj_la1[13] = jj_gen;
+          jj_la1[12] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -462,7 +455,7 @@
           t = jj_consume_token(RETOUCHED_BLOOMFILTER);
           break;
         default:
-          jj_la1[14] = jj_gen;
+          jj_la1[13] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -471,23 +464,23 @@
       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:
-        jj_la1[15] = jj_gen;
+        jj_la1[14] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -509,15 +502,15 @@
     column = identifier();
     columnSpec = ColumnSpec();
     createCommand.addColumnSpec(column, columnSpec);
-    label_5:
+    label_4:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case COMMA:
         ;
         break;
       default:
-        jj_la1[16] = jj_gen;
-        break label_5;
+        jj_la1[15] = jj_gen;
+        break label_4;
       }
       jj_consume_token(COMMA);
       column = identifier();
@@ -553,15 +546,15 @@
         column = identifier();
         columnSpec = ColumnSpec();
       alterCommand.addColumnSpec(column, columnSpec);
-        label_6:
+        label_5:
         while (true) {
           switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
           case COMMA:
             ;
             break;
           default:
-            jj_la1[17] = jj_gen;
-            break label_6;
+            jj_la1[16] = jj_gen;
+            break label_5;
           }
           jj_consume_token(COMMA);
           column = identifier();
@@ -584,7 +577,7 @@
       alterCommand.addColumnSpec(column, columnSpec);
         break;
       default:
-        jj_la1[18] = jj_gen;
+        jj_la1[17] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -630,7 +623,7 @@
       t = jj_consume_token(QUOTED_IDENTIFIER);
       break;
     default:
-      jj_la1[19] = jj_gen;
+      jj_la1[18] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -663,14 +656,14 @@
         t = jj_consume_token(QUOTED_IDENTIFIER);
         break;
       default:
-        jj_la1[20] = jj_gen;
+        jj_la1[19] = 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[20] = jj_gen;
       ;
     }
     {if (true) return deleteCommand;}
@@ -706,7 +699,7 @@
         jj_consume_token(FROM);
         break;
       default:
-        jj_la1[22] = jj_gen;
+        jj_la1[21] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -714,7 +707,7 @@
        select.setRowKey(rowKey);
       break;
     default:
-      jj_la1[23] = jj_gen;
+      jj_la1[22] = jj_gen;
       ;
     }
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -724,25 +717,25 @@
        select.setTimestamp(timestamp);
       break;
     default:
-      jj_la1[24] = jj_gen;
+      jj_la1[23] = 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[24] = 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) {
@@ -750,7 +743,7 @@
       }
       break;
     default:
-      jj_la1[26] = jj_gen;
+      jj_la1[25] = jj_gen;
       ;
     }
     {if (true) return select;}
@@ -790,7 +783,7 @@
     jj_consume_token(LPAREN);
    literal = getStringLiteral();
  if(literal != null) values.add(literal);
-    label_7:
+    label_6:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case COMMA:
@@ -800,8 +793,8 @@
         ;
         break;
       default:
-        jj_la1[27] = jj_gen;
-        break label_7;
+        jj_la1[26] = jj_gen;
+        break label_6;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case COMMA:
@@ -823,14 +816,14 @@
           jj_consume_token(QUOTED_IDENTIFIER);
           break;
         default:
-          jj_la1[28] = jj_gen;
+          jj_la1[27] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
        values.removeAll(values);
         break;
       default:
-        jj_la1[29] = jj_gen;
+        jj_la1[28] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -850,7 +843,7 @@
       s = jj_consume_token(QUOTED_IDENTIFIER);
       break;
     default:
-      jj_la1[30] = jj_gen;
+      jj_la1[29] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -876,7 +869,7 @@
         col = jj_consume_token(ASTERISK);
         break;
       default:
-        jj_la1[31] = jj_gen;
+        jj_la1[30] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -892,14 +885,14 @@
         col = jj_consume_token(STRING_LITERAL);
         break;
       default:
-        jj_la1[32] = jj_gen;
+        jj_la1[31] = 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[33] = jj_gen;
+      jj_la1[32] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -912,15 +905,15 @@
     jj_consume_token(LPAREN);
    literal = getColumn();
  if(literal != null) values.add(literal);
-    label_8:
+    label_7:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case COMMA:
         ;
         break;
       default:
-        jj_la1[34] = jj_gen;
-        break label_8;
+        jj_la1[33] = jj_gen;
+        break label_7;
       }
       jj_consume_token(COMMA);
         literal = getColumn();
@@ -936,15 +929,15 @@
   String table = null;
     table = identifier();
                          tableList.add(table);
-    label_9:
+    label_8:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case COMMA:
         ;
         break;
       default:
-        jj_la1[35] = jj_gen;
-        break label_9;
+        jj_la1[34] = jj_gen;
+        break label_8;
       }
       jj_consume_token(COMMA);
       table = identifier();
@@ -963,15 +956,15 @@
       } else {
         {if (true) return columnList;}
       }
-    label_10:
+    label_9:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case COMMA:
         ;
         break;
       default:
-        jj_la1[36] = jj_gen;
-        break label_10;
+        jj_la1[35] = jj_gen;
+        break label_9;
       }
       jj_consume_token(COMMA);
       column = getColumn();
@@ -981,7 +974,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) {
@@ -992,7 +985,7 @@
       t = jj_consume_token(INTEGER_LITERAL);
       break;
     default:
-      jj_la1[37] = jj_gen;
+      jj_la1[36] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1021,14 +1014,14 @@
         t = jj_consume_token(STRING_LITERAL);
         break;
       default:
-        jj_la1[38] = jj_gen;
+        jj_la1[37] = 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[39] = jj_gen;
+      jj_la1[38] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1049,33 +1042,33 @@
     finally { jj_save(0, xla); }
   }
 
-  final private boolean jj_3R_13() {
+  final private boolean jj_3R_12() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(63)) {
+    if (jj_scan_token(64)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(64)) return true;
+    if (jj_scan_token(65)) return true;
     }
     return false;
   }
 
   final private boolean jj_3_1() {
     if (jj_scan_token(ADD)) return true;
-    if (jj_3R_11()) return true;
+    if (jj_3R_10()) return true;
     return false;
   }
 
-  final private boolean jj_3R_12() {
+  final private boolean jj_3R_11() {
     if (jj_scan_token(ID)) return true;
     return false;
   }
 
-  final private boolean jj_3R_11() {
+  final private boolean jj_3R_10() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_12()) {
+    if (jj_3R_11()) {
     jj_scanpos = xsp;
-    if (jj_3R_13()) return true;
+    if (jj_3R_12()) return true;
     }
     return false;
   }
@@ -1089,7 +1082,7 @@
   public boolean lookingAhead = false;
   private boolean jj_semLA;
   private int jj_gen;
-  final private int[] jj_la1 = new int[40];
+  final private int[] jj_la1 = new int[39];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static private int[] jj_la1_2;
@@ -1099,13 +1092,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,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+      jj_la1_0 = new int[] {0xf3ffe0,0xf3ffe1,0xf3ffe0,0x0,0x0,0x0,0x0,0x33dbc0,0x33dbc0,0x0,0x600,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x2000000,0x3000000,0x3000000,0x40000000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
    }
    private static void jj_la1_1() {
-      jj_la1_1 = new int[] {0x0,0x0,0x0,0x8000000,0x38000000,0x38000000,0x38000000,0x38000000,0x8000000,0x8000000,0x88000000,0x0,0x1cc7000,0x38000,0x380000,0x1cc7000,0x4,0x4,0x6000000,0x80000000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x88000004,0x88000000,0x88000004,0x80000000,0x18000800,0x80000000,0x98000800,0x4,0x4,0x4,0x18000000,0x80000000,0x88000000,};
+      jj_la1_1 = new int[] {0x0,0x0,0x0,0x10000000,0x70000000,0x70000000,0x10000000,0x10000000,0x10000000,0x10000000,0x0,0x398e000,0x70000,0x700000,0x398e000,0x8,0x8,0xc000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x10000008,0x10000000,0x10000008,0x0,0x30001000,0x0,0x30001000,0x8,0x8,0x8,0x30000000,0x0,0x10000000,};
    }
    private static void jj_la1_2() {
-      jj_la1_2 = new int[] {0x0,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x1,0x1,0x0,0x1,0x1,0x0,0x0,0x0,0x0,0x1,0x1,};
+      jj_la1_2 = new int[] {0x0,0x4,0x0,0x0,0x0,0x0,0x3,0x0,0x0,0x3,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3,0x3,0x0,0x0,0x0,0x0,0x0,0x0,0x3,0x3,0x3,0x3,0x0,0x3,0x3,0x0,0x0,0x0,0x0,0x3,0x3,};
    }
   final private JJCalls[] jj_2_rtns = new JJCalls[1];
   private boolean jj_rescan = false;
@@ -1120,7 +1113,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 40; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 39; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -1133,7 +1126,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 40; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 39; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -1143,7 +1136,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 40; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 39; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -1153,7 +1146,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 40; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 39; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -1162,7 +1155,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 40; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 39; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -1171,7 +1164,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 40; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 39; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -1282,15 +1275,15 @@
 
   public ParseException generateParseException() {
     jj_expentries.removeAllElements();
-    boolean[] la1tokens = new boolean[66];
-    for (int i = 0; i < 66; i++) {
+    boolean[] la1tokens = new boolean[67];
+    for (int i = 0; i < 67; i++) {
       la1tokens[i] = false;
     }
     if (jj_kind >= 0) {
       la1tokens[jj_kind] = true;
       jj_kind = -1;
     }
-    for (int i = 0; i < 40; i++) {
+    for (int i = 0; i < 39; i++) {
       if (jj_la1[i] == jj_gen) {
         for (int j = 0; j < 32; j++) {
           if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -1305,7 +1298,7 @@
         }
       }
     }
-    for (int i = 0; i < 66; i++) {
+    for (int i = 0; i < 67; i++) {
       if (la1tokens[i]) {
         jj_expentry = new int[1];
         jj_expentry[0] = i;

Modified: lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserConstants.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserConstants.java?rev=609254&r1=609253&r2=609254&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserConstants.java (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserConstants.java Sat Jan  5 20:43:54 2008
@@ -12,58 +12,59 @@
   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 LPAREN = 35;
-  int RPAREN = 36;
-  int EQUALS = 37;
-  int LCOMP = 38;
-  int RCOMP = 39;
-  int NOT = 40;
-  int IN = 41;
-  int NOTEQUAL = 42;
-  int ASTERISK = 43;
-  int MAX_VERSIONS = 44;
-  int MAX_LENGTH = 45;
-  int COMPRESSION = 46;
-  int NONE = 47;
-  int BLOCK = 48;
-  int RECORD = 49;
-  int IN_MEMORY = 50;
-  int BLOOMFILTER = 51;
-  int COUNTING_BLOOMFILTER = 52;
-  int RETOUCHED_BLOOMFILTER = 53;
-  int VECTOR_SIZE = 54;
-  int NUM_HASH = 55;
-  int NUM_ENTRIES = 56;
-  int ADD = 57;
-  int CHANGE = 58;
-  int ID = 59;
-  int INTEGER_LITERAL = 60;
-  int FLOATING_POINT_LITERAL = 61;
-  int EXPONENT = 62;
-  int QUOTED_IDENTIFIER = 63;
-  int STRING_LITERAL = 64;
+  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 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 ID = 60;
+  int INTEGER_LITERAL = 61;
+  int FLOATING_POINT_LITERAL = 62;
+  int EXPONENT = 63;
+  int QUOTED_IDENTIFIER = 64;
+  int STRING_LITERAL = 65;
 
   int DEFAULT = 0;
 
@@ -81,6 +82,7 @@
     "\"desc\"",
     "\"create\"",
     "\"drop\"",
+    "\"truncate\"",
     "\"fs\"",
     "\"jar\"",
     "\"exit\"",

Modified: lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserTokenManager.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserTokenManager.java?rev=609254&r1=609253&r2=609254&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserTokenManager.java (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserTokenManager.java Sat Jan  5 20:43:54 2008
@@ -40,194 +40,194 @@
    switch (pos)
    {
       case 0:
-         if ((active0 & 0x7fff303ffffffe0L) != 0L)
+         if ((active0 & 0xfffe607ffffffe0L) != 0L)
          {
-            jjmatchedKind = 59;
+            jjmatchedKind = 60;
             return 1;
          }
          return -1;
       case 1:
-         if ((active0 & 0x4020200032000L) != 0L)
-            return 1;
-         if ((active0 & 0x7fbf101fffcdfe0L) != 0L)
+         if ((active0 & 0xff7e203fff9bfe0L) != 0L)
          {
             if (jjmatchedPos != 1)
             {
-               jjmatchedKind = 59;
+               jjmatchedKind = 60;
                jjmatchedPos = 1;
             }
             return 1;
          }
+         if ((active0 & 0x8040400064000L) != 0L)
+            return 1;
          return -1;
       case 2:
-         if ((active0 & 0x200010104004000L) != 0L)
-            return 1;
-         if ((active0 & 0x5fff000fbff9fe0L) != 0L)
+         if ((active0 & 0xbffe001f7ff3fe0L) != 0L)
          {
-            jjmatchedKind = 59;
+            jjmatchedKind = 60;
             jjmatchedPos = 2;
             return 1;
          }
+         if ((active0 & 0x400020208008000L) != 0L)
+            return 1;
          return -1;
       case 3:
-         if ((active0 & 0x800002029720L) != 0L)
-            return 1;
-         if ((active0 & 0x5ff7000f9fd08c0L) != 0L)
+         if ((active0 & 0xbfee001f3fa28c0L) != 0L)
          {
             if (jjmatchedPos != 3)
             {
-               jjmatchedKind = 59;
+               jjmatchedKind = 60;
                jjmatchedPos = 3;
             }
             return 1;
          }
+         if ((active0 & 0x1000004051720L) != 0L)
+            return 1;
          return -1;
       case 4:
-         if ((active0 & 0x10000810400c0L) != 0L)
-            return 1;
-         if ((active0 & 0x5fe700078f90a00L) != 0L)
+         if ((active0 & 0xbfce000f1f22a00L) != 0L)
          {
-            jjmatchedKind = 59;
+            jjmatchedKind = 60;
             jjmatchedPos = 4;
             return 1;
          }
+         if ((active0 & 0x20001020800c0L) != 0L)
+            return 1;
          return -1;
       case 5:
-         if ((active0 & 0x402000008390800L) != 0L)
-            return 1;
-         if ((active0 & 0x1fc700070c00200L) != 0L)
+         if ((active0 & 0x3f8e000e1802200L) != 0L)
          {
-            jjmatchedKind = 59;
+            jjmatchedKind = 60;
             jjmatchedPos = 5;
             return 1;
          }
+         if ((active0 & 0x804000010720800L) != 0L)
+            return 1;
          return -1;
       case 6:
-         if ((active0 & 0x400000L) != 0L)
-            return 1;
-         if ((active0 & 0x1fc700070800200L) != 0L)
+         if ((active0 & 0x3f8e000e1002200L) != 0L)
          {
-            jjmatchedKind = 59;
+            jjmatchedKind = 60;
             jjmatchedPos = 6;
             return 1;
          }
+         if ((active0 & 0x800000L) != 0L)
+            return 1;
          return -1;
       case 7:
-         if ((active0 & 0x17c700070000000L) != 0L)
+         if ((active0 & 0x2f8e000e0000000L) != 0L)
          {
-            jjmatchedKind = 59;
+            jjmatchedKind = 60;
             jjmatchedPos = 7;
             return 1;
          }
-         if ((active0 & 0x80000000800200L) != 0L)
+         if ((active0 & 0x100000001002200L) != 0L)
             return 1;
          return -1;
       case 8:
-         if ((active0 & 0x178700050000000L) != 0L)
+         if ((active0 & 0x8000040000000L) != 0L)
+            return 1;
+         if ((active0 & 0x2f0e000a0000000L) != 0L)
          {
-            jjmatchedKind = 59;
+            jjmatchedKind = 60;
             jjmatchedPos = 8;
             return 1;
          }
-         if ((active0 & 0x4000020000000L) != 0L)
-            return 1;
          return -1;
       case 9:
-         if ((active0 & 0x178500050000000L) != 0L)
+         if ((active0 & 0x400000000000L) != 0L)
+            return 1;
+         if ((active0 & 0x2f0a000a0000000L) != 0L)
          {
-            jjmatchedKind = 59;
+            jjmatchedKind = 60;
             jjmatchedPos = 9;
             return 1;
          }
-         if ((active0 & 0x200000000000L) != 0L)
-            return 1;
          return -1;
       case 10:
-         if ((active0 & 0x148400000000000L) != 0L)
+         if ((active0 & 0x290800000000000L) != 0L)
             return 1;
-         if ((active0 & 0x30100050000000L) != 0L)
+         if ((active0 & 0x602000a0000000L) != 0L)
          {
-            jjmatchedKind = 59;
+            jjmatchedKind = 60;
             jjmatchedPos = 10;
             return 1;
          }
          return -1;
       case 11:
-         if ((active0 & 0x100040000000L) != 0L)
+         if ((active0 & 0x200080000000L) != 0L)
             return 1;
-         if ((active0 & 0x30000010000000L) != 0L)
+         if ((active0 & 0x60000020000000L) != 0L)
          {
-            jjmatchedKind = 59;
+            jjmatchedKind = 60;
             jjmatchedPos = 11;
             return 1;
          }
          return -1;
       case 12:
-         if ((active0 & 0x30000010000000L) != 0L)
+         if ((active0 & 0x60000020000000L) != 0L)
          {
-            jjmatchedKind = 59;
+            jjmatchedKind = 60;
             jjmatchedPos = 12;
             return 1;
          }
          return -1;
       case 13:
-         if ((active0 & 0x30000000000000L) != 0L)
+         if ((active0 & 0x60000000000000L) != 0L)
          {
-            jjmatchedKind = 59;
+            jjmatchedKind = 60;
             jjmatchedPos = 13;
             return 1;
          }
-         if ((active0 & 0x10000000L) != 0L)
+         if ((active0 & 0x20000000L) != 0L)
             return 1;
          return -1;
       case 14:
-         if ((active0 & 0x30000000000000L) != 0L)
+         if ((active0 & 0x60000000000000L) != 0L)
          {
-            jjmatchedKind = 59;
+            jjmatchedKind = 60;
             jjmatchedPos = 14;
             return 1;
          }
          return -1;
       case 15:
-         if ((active0 & 0x30000000000000L) != 0L)
+         if ((active0 & 0x60000000000000L) != 0L)
          {
-            jjmatchedKind = 59;
+            jjmatchedKind = 60;
             jjmatchedPos = 15;
             return 1;
          }
          return -1;
       case 16:
-         if ((active0 & 0x30000000000000L) != 0L)
+         if ((active0 & 0x60000000000000L) != 0L)
          {
-            jjmatchedKind = 59;
+            jjmatchedKind = 60;
             jjmatchedPos = 16;
             return 1;
          }
          return -1;
       case 17:
-         if ((active0 & 0x30000000000000L) != 0L)
+         if ((active0 & 0x60000000000000L) != 0L)
          {
-            jjmatchedKind = 59;
+            jjmatchedKind = 60;
             jjmatchedPos = 17;
             return 1;
          }
          return -1;
       case 18:
-         if ((active0 & 0x30000000000000L) != 0L)
+         if ((active0 & 0x60000000000000L) != 0L)
          {
-            jjmatchedKind = 59;
+            jjmatchedKind = 60;
             jjmatchedPos = 18;
             return 1;
          }
          return -1;
       case 19:
-         if ((active0 & 0x20000000000000L) != 0L)
+         if ((active0 & 0x40000000000000L) != 0L)
          {
-            jjmatchedKind = 59;
+            jjmatchedKind = 60;
             jjmatchedPos = 19;
             return 1;
          }
-         if ((active0 & 0x10000000000000L) != 0L)
+         if ((active0 & 0x20000000000000L) != 0L)
             return 1;
          return -1;
       default :
@@ -257,77 +257,77 @@
    switch(curChar)
    {
       case 33:
-         return jjMoveStringLiteralDfa1_0(0x40000000000L);
+         return jjMoveStringLiteralDfa1_0(0x80000000000L);
       case 40:
-         return jjStopAtPos(0, 35);
-      case 41:
          return jjStopAtPos(0, 36);
+      case 41:
+         return jjStopAtPos(0, 37);
       case 42:
-         return jjStopAtPos(0, 43);
+         return jjStopAtPos(0, 44);
       case 44:
-         return jjStopAtPos(0, 34);
+         return jjStopAtPos(0, 35);
       case 59:
-         return jjStopAtPos(0, 65);
+         return jjStopAtPos(0, 66);
       case 60:
-         return jjStopAtPos(0, 39);
+         return jjStopAtPos(0, 40);
       case 61:
-         return jjStopAtPos(0, 37);
-      case 62:
          return jjStopAtPos(0, 38);
+      case 62:
+         return jjStopAtPos(0, 39);
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa1_0(0x200000100000040L);
+         return jjMoveStringLiteralDfa1_0(0x400000200000040L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa1_0(0x9000000000000L);
+         return jjMoveStringLiteralDfa1_0(0x12000000000000L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa1_0(0x410400010000880L);
+         return jjMoveStringLiteralDfa1_0(0x820800020000880L);
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa1_0(0x481600L);
+         return jjMoveStringLiteralDfa1_0(0x901600L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa1_0(0x208000L);
+         return jjMoveStringLiteralDfa1_0(0x410000L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa1_0(0x2002000L);
+         return jjMoveStringLiteralDfa1_0(0x4004000L);
       case 72:
       case 104:
          return jjMoveStringLiteralDfa1_0(0x20L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa1_0(0x4020000030000L);
+         return jjMoveStringLiteralDfa1_0(0x8040000060000L);
       case 74:
       case 106:
-         return jjMoveStringLiteralDfa1_0(0x4000L);
+         return jjMoveStringLiteralDfa1_0(0x8000L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa1_0(0x80000000L);
+         return jjMoveStringLiteralDfa1_0(0x100000000L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa1_0(0x300000000000L);
+         return jjMoveStringLiteralDfa1_0(0x600000000000L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa1_0(0x180810040000000L);
+         return jjMoveStringLiteralDfa1_0(0x301020080000000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa1_0(0x200000000L);
+         return jjMoveStringLiteralDfa1_0(0x400000000L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa1_0(0x22000004000000L);
+         return jjMoveStringLiteralDfa1_0(0x44000008000000L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa1_0(0x900100L);
+         return jjMoveStringLiteralDfa1_0(0x1200100L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa1_0(0x20040000L);
+         return jjMoveStringLiteralDfa1_0(0x40082000L);
       case 86:
       case 118:
-         return jjMoveStringLiteralDfa1_0(0x40000008000000L);
+         return jjMoveStringLiteralDfa1_0(0x80000010000000L);
       case 87:
       case 119:
-         return jjMoveStringLiteralDfa1_0(0x1000000L);
+         return jjMoveStringLiteralDfa1_0(0x2000000L);
       default :
          return jjMoveNfa_0(0, 0);
    }
@@ -342,57 +342,57 @@
    switch(curChar)
    {
       case 61:
-         if ((active0 & 0x40000000000L) != 0L)
-            return jjStopAtPos(1, 42);
+         if ((active0 & 0x80000000000L) != 0L)
+            return jjStopAtPos(1, 43);
          break;
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa2_0(active0, 0x300008044000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x600010088000L);
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa2_0(active0, 0x200000000000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x400000000000000L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa2_0(active0, 0x62000000180620L);
+         return jjMoveStringLiteralDfa2_0(active0, 0xc4000000300620L);
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa2_0(active0, 0x400000001000100L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x800000002000100L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa2_0(active0, 0xa0400000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x140800000L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa2_0(active0, 0x90000000000c0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x120000000000c0L);
       case 78:
       case 110:
-         if ((active0 & 0x20000000000L) != 0L)
+         if ((active0 & 0x40000000000L) != 0L)
          {
-            jjmatchedKind = 41;
+            jjmatchedKind = 42;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x4000100230000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x8000200460000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa2_0(active0, 0x10c10014000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x21820028000000L);
       case 82:
       case 114:
-         if ((active0 & 0x200000000L) != 0L)
-            return jjStartNfaWithStates_0(1, 33, 1);
-         return jjMoveStringLiteralDfa2_0(active0, 0x2001800L);
+         if ((active0 & 0x400000000L) != 0L)
+            return jjStartNfaWithStates_0(1, 34, 1);
+         return jjMoveStringLiteralDfa2_0(active0, 0x4003800L);
       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);
+         return jjMoveStringLiteralDfa2_0(active0, 0x1000000L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa2_0(active0, 0x180000040000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x300000080000000L);
       case 88:
       case 120:
-         return jjMoveStringLiteralDfa2_0(active0, 0x8000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x10000L);
       default :
          break;
    }
@@ -410,65 +410,65 @@
    switch(curChar)
    {
       case 95:
-         return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000L);
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa3_0(active0, 0x400000000a00000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x800000001400000L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa3_0(active0, 0x40000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x80000L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa3_0(active0, 0x42000000000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x84000000000000L);
       case 68:
       case 100:
-         if ((active0 & 0x100000000L) != 0L)
-            return jjStartNfaWithStates_0(2, 32, 1);
-         else if ((active0 & 0x200000000000000L) != 0L)
-            return jjStartNfaWithStates_0(2, 57, 1);
+         if ((active0 & 0x200000000L) != 0L)
+            return jjStartNfaWithStates_0(2, 33, 1);
+         else if ((active0 & 0x400000000000000L) != 0L)
+            return jjStartNfaWithStates_0(2, 58, 1);
          break;
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa3_0(active0, 0x1000880L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x2000880L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa3_0(active0, 0x8000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x10000L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa3_0(active0, 0x18180020L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x30300020L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa3_0(active0, 0x1804000e0000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x3008001c0000000L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa3_0(active0, 0x800000000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1000000000000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa3_0(active0, 0x9000002001100L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x12000004001100L);
       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);
       case 84:
       case 116:
-         if ((active0 & 0x10000000000L) != 0L)
-            return jjStartNfaWithStates_0(2, 40, 1);
-         return jjMoveStringLiteralDfa3_0(active0, 0x20000000020040L);
+         if ((active0 & 0x20000000000L) != 0L)
+            return jjStartNfaWithStates_0(2, 41, 1);
+         return jjMoveStringLiteralDfa3_0(active0, 0x40000000040040L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa3_0(active0, 0x10000000000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x20000000002000L);
       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, 0x300000000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x600000000000L);
       default :
          break;
    }
@@ -486,13 +486,13 @@
    switch(curChar)
    {
       case 95:
-         return jjMoveStringLiteralDfa4_0(active0, 0x180300040000000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x300600080000000L);
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa4_0(active0, 0x400880L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x800880L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa4_0(active0, 0x200000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x400000L);
       case 67:
       case 99:
          if ((active0 & 0x400L) != 0L)
@@ -500,49 +500,49 @@
             jjmatchedKind = 10;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x1000000000200L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x2000000000200L);
       case 69:
       case 101:
-         if ((active0 & 0x800000000000L) != 0L)
-            return jjStartNfaWithStates_0(3, 47, 1);
-         return jjMoveStringLiteralDfa4_0(active0, 0x20190040L);
+         if ((active0 & 0x1000000000000L) != 0L)
+            return jjStartNfaWithStates_0(3, 48, 1);
+         return jjMoveStringLiteralDfa4_0(active0, 0x40320040L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa4_0(active0, 0x80000000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x100000000L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa4_0(active0, 0x40000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x80000L);
       case 77:
       case 109:
-         if ((active0 & 0x2000000L) != 0L)
-            return jjStartNfaWithStates_0(3, 25, 1);
-         return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000L);
+         if ((active0 & 0x4000000L) != 0L)
+            return jjStartNfaWithStates_0(3, 26, 1);
+         return jjMoveStringLiteralDfa4_0(active0, 0x8000000000000L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa4_0(active0, 0x410000000000000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x820000000002000L);
       case 79:
       case 111:
-         if ((active0 & 0x20000L) != 0L)
-            return jjStartNfaWithStates_0(3, 17, 1);
-         return jjMoveStringLiteralDfa4_0(active0, 0x2a000000000000L);
+         if ((active0 & 0x40000L) != 0L)
+            return jjStartNfaWithStates_0(3, 18, 1);
+         return jjMoveStringLiteralDfa4_0(active0, 0x54000000000000L);
       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, 0x400000000000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x800000000000L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa4_0(active0, 0x1800000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x3000000L);
       case 84:
       case 116:
-         if ((active0 & 0x8000L) != 0L)
-            return jjStartNfaWithStates_0(3, 15, 1);
-         return jjMoveStringLiteralDfa4_0(active0, 0x40000000000000L);
+         if ((active0 & 0x10000L) != 0L)
+            return jjStartNfaWithStates_0(3, 16, 1);
+         return jjMoveStringLiteralDfa4_0(active0, 0x80000000000000L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa4_0(active0, 0x18000000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x30000000L);
       case 87:
       case 119:
          if ((active0 & 0x100L) != 0L)
@@ -566,58 +566,58 @@
    {
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa5_0(active0, 0x400000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x800000L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa5_0(active0, 0x100000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x202000L);
       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, 0x104000008000000L);
+         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, 0x208000010000000L);
       case 71:
       case 103:
-         return jjMoveStringLiteralDfa5_0(active0, 0x400000000000000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x800000000000000L);
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa5_0(active0, 0x80000000000000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x100000000000000L);
       case 75:
       case 107:
-         if ((active0 & 0x1000000000000L) != 0L)
-            return jjStartNfaWithStates_0(4, 48, 1);
+         if ((active0 & 0x2000000000000L) != 0L)
+            return jjStartNfaWithStates_0(4, 49, 1);
          break;
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa5_0(active0, 0x200000200000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x400000400000L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa5_0(active0, 0x8000010000000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x10000020000000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa5_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x80000000000000L);
       case 82:
       case 114:
          if ((active0 & 0x40L) != 0L)
             return jjStartNfaWithStates_0(4, 6, 1);
          else if ((active0 & 0x80L) != 0L)
             return jjStartNfaWithStates_0(4, 7, 1);
-         return jjMoveStringLiteralDfa5_0(active0, 0x2400000010200L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x4800000020200L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa5_0(active0, 0x20000000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x40000000L);
       case 84:
       case 116:
-         if ((active0 & 0x80000000L) != 0L)
-            return jjStartNfaWithStates_0(4, 31, 1);
-         return jjMoveStringLiteralDfa5_0(active0, 0x10000000880800L);
+         if ((active0 & 0x100000000L) != 0L)
+            return jjStartNfaWithStates_0(4, 32, 1);
+         return jjMoveStringLiteralDfa5_0(active0, 0x20000001100800L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa5_0(active0, 0x20000000000000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x40000000000000L);
       case 86:
       case 118:
-         return jjMoveStringLiteralDfa5_0(active0, 0x100040000000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x200080000000L);
       default :
          break;
    }
@@ -636,56 +636,56 @@
    {
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa6_0(active0, 0x80000000000000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x100000000002000L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa6_0(active0, 0x20000000000000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x40000000000000L);
       case 68:
       case 100:
-         if ((active0 & 0x2000000000000L) != 0L)
-            return jjStartNfaWithStates_0(5, 49, 1);
+         if ((active0 & 0x4000000000000L) != 0L)
+            return jjStartNfaWithStates_0(5, 50, 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 & 0x400000000000000L) != 0L)
-            return jjStartNfaWithStates_0(5, 58, 1);
-         return jjMoveStringLiteralDfa6_0(active0, 0x700040000000L);
+         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 & 0x800000000000000L) != 0L)
+            return jjStartNfaWithStates_0(5, 59, 1);
+         return jjMoveStringLiteralDfa6_0(active0, 0xe00080000000L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa6_0(active0, 0x8000000000000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x10000000000000L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa6_0(active0, 0x10000000800200L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x20000001000200L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa6_0(active0, 0x400000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x800000L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa6_0(active0, 0x4000000000000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x8000000000000L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa6_0(active0, 0x100000010000000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x200000020000000L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa6_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x80000000000000L);
       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;
    }
@@ -703,42 +703,42 @@
    switch(curChar)
    {
       case 95:
-         return jjMoveStringLiteralDfa7_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x80000000000000L);
       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, 0x20000000000000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x40000000000000L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa7_0(active0, 0x8000000000000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x10000000000000L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa7_0(active0, 0x10200000800000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x20400001000000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa7_0(active0, 0x4000000000000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x8000000000000L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa7_0(active0, 0x100040000000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x200080000000L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa7_0(active0, 0x80400000000000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x100800000000000L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa7_0(active0, 0x100000000000000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x200000000002000L);
       default :
          break;
    }
@@ -757,34 +757,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, 0x20000000000000L);
+         else if ((active0 & 0x2000L) != 0L)
+            return jjStartNfaWithStates_0(7, 13, 1);
+         return jjMoveStringLiteralDfa8_0(active0, 0x40000000000000L);
       case 71:
       case 103:
-         if ((active0 & 0x800000L) != 0L)
-            return jjStartNfaWithStates_0(7, 23, 1);
-         return jjMoveStringLiteralDfa8_0(active0, 0x10200000000000L);
+         if ((active0 & 0x1000000L) != 0L)
+            return jjStartNfaWithStates_0(7, 24, 1);
+         return jjMoveStringLiteralDfa8_0(active0, 0x20400000000000L);
       case 72:
       case 104:
-         if ((active0 & 0x80000000000000L) != 0L)
-            return jjStartNfaWithStates_0(7, 55, 1);
+         if ((active0 & 0x100000000000000L) != 0L)
+            return jjStartNfaWithStates_0(7, 56, 1);
          break;
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa8_0(active0, 0x8000000000000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x10000000000000L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa8_0(active0, 0x20000000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x40000000L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa8_0(active0, 0x104000000000000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x208000000000000L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa8_0(active0, 0x40500040000000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x80a00080000000L);
       default :
          break;
    }
@@ -802,28 +804,28 @@
    switch(curChar)
    {
       case 95:
-         return jjMoveStringLiteralDfa9_0(active0, 0x10000000000000L);
+         return jjMoveStringLiteralDfa9_0(active0, 0x20000000000000L);
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa9_0(active0, 0x20000000000000L);
+         return jjMoveStringLiteralDfa9_0(active0, 0x40000000000000L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa9_0(active0, 0x140500040000000L);
+         return jjMoveStringLiteralDfa9_0(active0, 0x280a00080000000L);
       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, 0x8200000000000L);
+         return jjMoveStringLiteralDfa9_0(active0, 0x10400000000000L);
       case 89:
       case 121:
-         if ((active0 & 0x4000000000000L) != 0L)
-            return jjStartNfaWithStates_0(8, 50, 1);
+         if ((active0 & 0x8000000000000L) != 0L)
+            return jjStartNfaWithStates_0(8, 51, 1);
          break;
       default :
          break;
@@ -842,27 +844,27 @@
    switch(curChar)
    {
       case 95:
-         return jjMoveStringLiteralDfa10_0(active0, 0x20000000000000L);
+         return jjMoveStringLiteralDfa10_0(active0, 0x40000000000000L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa10_0(active0, 0x10000000000000L);
+         return jjMoveStringLiteralDfa10_0(active0, 0x20000000000000L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa10_0(active0, 0x108000000000000L);
+         return jjMoveStringLiteralDfa10_0(active0, 0x210000000000000L);
       case 72:
       case 104:
-         if ((active0 & 0x200000000000L) != 0L)
-            return jjStartNfaWithStates_0(9, 45, 1);
+         if ((active0 & 0x400000000000L) != 0L)
+            return jjStartNfaWithStates_0(9, 46, 1);
          break;
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa10_0(active0, 0x10000000L);
+         return jjMoveStringLiteralDfa10_0(active0, 0x20000000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa10_0(active0, 0x500040000000L);
+         return jjMoveStringLiteralDfa10_0(active0, 0xa00080000000L);
       case 90:
       case 122:
-         return jjMoveStringLiteralDfa10_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa10_0(active0, 0x80000000000000L);
       default :
          break;
    }
@@ -881,29 +883,29 @@
    {
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa11_0(active0, 0x20000000000000L);
+         return jjMoveStringLiteralDfa11_0(active0, 0x40000000000000L);
       case 69:
       case 101:
-         if ((active0 & 0x40000000000000L) != 0L)
-            return jjStartNfaWithStates_0(10, 54, 1);
+         if ((active0 & 0x80000000000000L) != 0L)
+            return jjStartNfaWithStates_0(10, 55, 1);
          break;
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa11_0(active0, 0x10000010000000L);
+         return jjMoveStringLiteralDfa11_0(active0, 0x20000020000000L);
       case 78:
       case 110:
-         if ((active0 & 0x400000000000L) != 0L)
-            return jjStartNfaWithStates_0(10, 46, 1);
-         return jjMoveStringLiteralDfa11_0(active0, 0x100040000000L);
+         if ((active0 & 0x800000000000L) != 0L)
+            return jjStartNfaWithStates_0(10, 47, 1);
+         return jjMoveStringLiteralDfa11_0(active0, 0x200080000000L);
       case 82:
       case 114:
-         if ((active0 & 0x8000000000000L) != 0L)
-            return jjStartNfaWithStates_0(10, 51, 1);
+         if ((active0 & 0x10000000000000L) != 0L)
+            return jjStartNfaWithStates_0(10, 52, 1);
          break;
       case 83:
       case 115:
-         if ((active0 & 0x100000000000000L) != 0L)
-            return jjStartNfaWithStates_0(10, 56, 1);
+         if ((active0 & 0x200000000000000L) != 0L)
+            return jjStartNfaWithStates_0(10, 57, 1);
          break;
       default :
          break;
@@ -923,19 +925,19 @@
    {
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa12_0(active0, 0x10000000L);
+         return jjMoveStringLiteralDfa12_0(active0, 0x20000000L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa12_0(active0, 0x20000000000000L);
+         return jjMoveStringLiteralDfa12_0(active0, 0x40000000000000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa12_0(active0, 0x10000000000000L);
+         return jjMoveStringLiteralDfa12_0(active0, 0x20000000000000L);
       case 83:
       case 115:
-         if ((active0 & 0x40000000L) != 0L)
-            return jjStartNfaWithStates_0(11, 30, 1);
-         else if ((active0 & 0x100000000000L) != 0L)
-            return jjStartNfaWithStates_0(11, 44, 1);
+         if ((active0 & 0x80000000L) != 0L)
+            return jjStartNfaWithStates_0(11, 31, 1);
+         else if ((active0 & 0x200000000000L) != 0L)
+            return jjStartNfaWithStates_0(11, 45, 1);
          break;
       default :
          break;
@@ -955,10 +957,10 @@
    {
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa13_0(active0, 0x10000000L);
+         return jjMoveStringLiteralDfa13_0(active0, 0x20000000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa13_0(active0, 0x30000000000000L);
+         return jjMoveStringLiteralDfa13_0(active0, 0x60000000000000L);
       default :
          break;
    }
@@ -977,14 +979,14 @@
    {
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa14_0(active0, 0x10000000000000L);
+         return jjMoveStringLiteralDfa14_0(active0, 0x20000000000000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa14_0(active0, 0x20000000000000L);
+         return jjMoveStringLiteralDfa14_0(active0, 0x40000000000000L);
       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;
@@ -1004,10 +1006,10 @@
    {
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa15_0(active0, 0x10000000000000L);
+         return jjMoveStringLiteralDfa15_0(active0, 0x20000000000000L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa15_0(active0, 0x20000000000000L);
+         return jjMoveStringLiteralDfa15_0(active0, 0x40000000000000L);
       default :
          break;
    }
@@ -1026,10 +1028,10 @@
    {
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa16_0(active0, 0x20000000000000L);
+         return jjMoveStringLiteralDfa16_0(active0, 0x40000000000000L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa16_0(active0, 0x10000000000000L);
+         return jjMoveStringLiteralDfa16_0(active0, 0x20000000000000L);
       default :
          break;
    }
@@ -1048,10 +1050,10 @@
    {
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa17_0(active0, 0x20000000000000L);
+         return jjMoveStringLiteralDfa17_0(active0, 0x40000000000000L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa17_0(active0, 0x10000000000000L);
+         return jjMoveStringLiteralDfa17_0(active0, 0x20000000000000L);
       default :
          break;
    }
@@ -1070,10 +1072,10 @@
    {
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa18_0(active0, 0x20000000000000L);
+         return jjMoveStringLiteralDfa18_0(active0, 0x40000000000000L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa18_0(active0, 0x10000000000000L);
+         return jjMoveStringLiteralDfa18_0(active0, 0x20000000000000L);
       default :
          break;
    }
@@ -1092,10 +1094,10 @@
    {
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa19_0(active0, 0x10000000000000L);
+         return jjMoveStringLiteralDfa19_0(active0, 0x20000000000000L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa19_0(active0, 0x20000000000000L);
+         return jjMoveStringLiteralDfa19_0(active0, 0x40000000000000L);
       default :
          break;
    }
@@ -1114,11 +1116,11 @@
    {
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa20_0(active0, 0x20000000000000L);
+         return jjMoveStringLiteralDfa20_0(active0, 0x40000000000000L);
       case 82:
       case 114:
-         if ((active0 & 0x10000000000000L) != 0L)
-            return jjStartNfaWithStates_0(19, 52, 1);
+         if ((active0 & 0x20000000000000L) != 0L)
+            return jjStartNfaWithStates_0(19, 53, 1);
          break;
       default :
          break;
@@ -1138,8 +1140,8 @@
    {
       case 82:
       case 114:
-         if ((active0 & 0x20000000000000L) != 0L)
-            return jjStartNfaWithStates_0(20, 53, 1);
+         if ((active0 & 0x40000000000000L) != 0L)
+            return jjStartNfaWithStates_0(20, 54, 1);
          break;
       default :
          break;
@@ -1201,14 +1203,14 @@
                case 0:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 60)
-                        kind = 60;
+                     if (kind > 61)
+                        kind = 61;
                      jjCheckNAddStates(0, 6);
                   }
                   else if ((0x400e00000000000L & l) != 0L)
                   {
-                     if (kind > 59)
-                        kind = 59;
+                     if (kind > 60)
+                        kind = 60;
                      jjCheckNAdd(1);
                   }
                   else if (curChar == 39)
@@ -1221,8 +1223,8 @@
                case 1:
                   if ((0x7ffe00000000000L & l) == 0L)
                      break;
-                  if (kind > 59)
-                     kind = 59;
+                  if (kind > 60)
+                     kind = 60;
                   jjCheckNAdd(1);
                   break;
                case 2:
@@ -1232,8 +1234,8 @@
                case 3:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 61)
-                     kind = 61;
+                  if (kind > 62)
+                     kind = 62;
                   jjCheckNAddTwoStates(3, 4);
                   break;
                case 5:
@@ -1243,8 +1245,8 @@
                case 6:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 61)
-                     kind = 61;
+                  if (kind > 62)
+                     kind = 62;
                   jjCheckNAdd(6);
                   break;
                case 7:
@@ -1256,8 +1258,8 @@
                      jjCheckNAddTwoStates(8, 9);
                   break;
                case 9:
-                  if (curChar == 34 && kind > 63)
-                     kind = 63;
+                  if (curChar == 34 && kind > 64)
+                     kind = 64;
                   break;
                case 10:
                   if (curChar == 39)
@@ -1280,21 +1282,21 @@
                      jjCheckNAddStates(10, 12);
                   break;
                case 15:
-                  if (curChar == 39 && kind > 64)
-                     kind = 64;
+                  if (curChar == 39 && kind > 65)
+                     kind = 65;
                   break;
                case 16:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 60)
-                     kind = 60;
+                  if (kind > 61)
+                     kind = 61;
                   jjCheckNAddStates(0, 6);
                   break;
                case 17:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 60)
-                     kind = 60;
+                  if (kind > 61)
+                     kind = 61;
                   jjCheckNAdd(17);
                   break;
                case 18:
@@ -1308,8 +1310,8 @@
                case 20:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 61)
-                     kind = 61;
+                  if (kind > 62)
+                     kind = 62;
                   jjCheckNAddTwoStates(20, 21);
                   break;
                case 22:
@@ -1319,8 +1321,8 @@
                case 23:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 61)
-                     kind = 61;
+                  if (kind > 62)
+                     kind = 62;
                   jjCheckNAdd(23);
                   break;
                case 24:
@@ -1334,15 +1336,15 @@
                case 27:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 61)
-                     kind = 61;
+                  if (kind > 62)
+                     kind = 62;
                   jjCheckNAdd(27);
                   break;
                case 28:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 61)
-                     kind = 61;
+                  if (kind > 62)
+                     kind = 62;
                   jjCheckNAddTwoStates(28, 29);
                   break;
                case 30:
@@ -1352,8 +1354,8 @@
                case 31:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 61)
-                     kind = 61;
+                  if (kind > 62)
+                     kind = 62;
                   jjCheckNAdd(31);
                   break;
                default : break;
@@ -1371,8 +1373,8 @@
                case 1:
                   if ((0x47fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 59)
-                     kind = 59;
+                  if (kind > 60)
+                     kind = 60;
                   jjCheckNAdd(1);
                   break;
                case 4:
@@ -1448,14 +1450,14 @@
 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", "\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, "\73", };
+null, null, null, null, null, null, null, null, "\54", "\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, "\73", };
 public static final String[] lexStateNames = {
    "DEFAULT", 
 };
 static final long[] jjtoToken = {
-   0xbfffffffffffffe1L, 0x3L, 
+   0x7fffffffffffffe1L, 0x7L, 
 };
 static final long[] jjtoSkip = {
    0x1eL, 0x0L, 



Mime
View raw message