hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r608289 - in /lucene/hadoop/trunk/src/contrib/hbase: ./ src/java/org/apache/hadoop/hbase/shell/ src/java/org/apache/hadoop/hbase/shell/algebra/ src/java/org/apache/hadoop/hbase/shell/generated/ src/test/org/apache/hadoop/hbase/shell/ src/te...
Date Thu, 03 Jan 2008 00:06:40 GMT
Author: stack
Date: Wed Jan  2 16:06:38 2008
New Revision: 608289

URL: http://svn.apache.org/viewvc?rev=608289&view=rev
Log:
HADOOP-2506 Remove the algebra package

Removed:
    lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/SaveCommand.java
    lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/SubstituteCommand.java
    lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/VariableRef.java
    lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/VariablesPool.java
    lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/algebra/
    lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/shell/TestSubstitutionVariables.java
    lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/shell/algebra/
Modified:
    lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt
    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/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=608289&r1=608288&r2=608289&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt Wed Jan  2 16:06:38 2008
@@ -5,6 +5,8 @@
   INCOMPATIBLE CHANGES
    HADOOP-2056 A table with row keys containing colon fails to split regions
    HADOOP-2079 Fix generated HLog, HRegion names
+   HADOOP-2495 Minor performance improvements: Slim-down BatchOperation, etc. 
+   HADOOP-2506 Remove the algebra package
 
   NEW FEATURES
     HADOOP-2061 Add new Base64 dialects
@@ -22,7 +24,6 @@
    HADOOP-2479 Save on number of Text object creations
    HADOOP-2485 Make mapfile index interval configurable (Set default to 32
                instead of 128)
-   HADOOP-2495 Minor performance improvements: Slim-down BatchOperation, etc. 
 
   BUG FIXES
    HADOOP-2059 In tests, exceptions in min dfs shutdown should not fail test

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=608289&r1=608288&r2=608289&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 Wed Jan  2 16:06:38 2008
@@ -101,7 +101,6 @@
    | <AND: "and">
    | <OR:  "or">
    | <COMMA: ",">
-   | <DOT: ".">
    | <LPAREN: "(">
    | <RPAREN: ")">
    | <EQUALS: "=">
@@ -126,20 +125,11 @@
    | <NUM_ENTRIES: "num_entries">
    | <ADD: "add">
    | <CHANGE: "change">
-   | <META_TABLE: ".META.">
-   | <ROOT_TABLE: "-ROOT-">
-}
-
-TOKEN : 
-{
-     <SAVE: "save">
-   | <GROUP: "group">
-   | <BY: "by">
 }
 
 TOKEN : /** Literals */
 {
-   <ID: ["A"-"Z","a"-"z","_","-",":","/","~"] (["A"-"Z","a"-"z","0"-"9","_","-",":","/","~"])* >
+   <ID: ["A"-"Z","a"-"z","_","-",":","/","~","."] (["A"-"Z","a"-"z","0"-"9","_","-",":","/","~","."])* >
  | <INTEGER_LITERAL: (["0"-"9"])+ >
  | <FLOATING_POINT_LITERAL:
    (["0"-"9"])+ "." (["0"-"9"])+ (<EXPONENT>)?
@@ -190,8 +180,6 @@
       | cmd = clearCommand()
       | cmd = fsCommand()
       | cmd = jarCommand()
-      | cmd = substituteCommand()
-      | cmd = saveCommand()
   )
    {
        return cmd;
@@ -235,7 +223,7 @@
 {
   <JAR>
   (
-      ( t=<ID> | t=<INTEGER_LITERAL> | t=<DOT> | t=<FLOATING_POINT_LITERAL> )
+      ( t=<ID> | t=<INTEGER_LITERAL> | t=<FLOATING_POINT_LITERAL> )
       { path += t.image.toString(); }
   )*
   t=<JAR>
@@ -274,8 +262,6 @@
        | t=<CLEAR>
        | t=<FS>
        | t=<JAR>
-       | t=<GROUP>
-       | t=<SAVE>
        | t=<ID>
      ) { argument = t.image.toString(); }
    ]
@@ -650,96 +636,6 @@
    }
 }
 
-SubstituteCommand substituteCommand() :
-{
-  Token key = null;
-  Token chainKey = null;
-  Token operation = null;
-  String tableName = null;
-  String condition = "";
-  List<String> notInList = new ArrayList<String>();
-  SubstituteCommand substitute = new SubstituteCommand(this.out);
-  Token extendedKey = null;
-}
-{
-  key=<ID><EQUALS>
-  { substitute.setKey(key.image.toString()); }
-  (
-      chainKey=<ID><DOT>
-    { substitute.setChainKey(chainKey.image.toString()); }
-      operation = <ID> 
-    { substitute.setOperation(operation.image.toString()); }
-    <LPAREN>
-    {
-      String operationType = operation.image.toLowerCase();
-      if(operationType.equals("projection")) {
-        List<String> columnList = columnList();
-        for (int i = 0; i < columnList.size(); i++) {
-          condition += appendIndicator(columnList.get(i)) + " ";
-        }
-    
-      } else {
-        condition = booleanTerm();
-      }
-      
-      substitute.setCondition(condition);
-    }
-    <RPAREN>
-    [
-      <AND> extendedKey=<ID>
-      {
-        String eKey = extendedKey.image.toString();
-        String cKey = chainKey.image.toString();
-        substitute.setCondition(condition);
-        if (secondR.equals(eKey)) {
-          substitute.resetVariableRelation(eKey, cKey);
-        } else {
-          substitute.resetVariableRelation(cKey, eKey);
-        }
-      }
-    ]
-  | <TABLE><LPAREN>
-    tableName = identifier() 
-    { substitute.setInput(tableName); }
-    <RPAREN>
-  | operation=<GROUP>chainKey=<ID><BY>
-    <LPAREN>
-      { 
-        List<String> columnList = columnList(); 
-        for (int i = 0; i < columnList.size(); i++) {
-          condition += appendIndicator(columnList.get(i));
-        }  
-      }
-    <RPAREN>
-    { 
-      substitute.setChainKey(chainKey.image.toString());
-      substitute.setOperation(operation.image.toString());
-      substitute.setCondition(condition);
-    }
-  )
-  
-  {
-    return substitute;
-  }
-}
-
-SaveCommand saveCommand() :
-{
-  Token t = null;
-  String tableName;
-  SaveCommand save = new SaveCommand(this.out);
-}
-{
-  <SAVE> t=<ID>
-  { save.setStatement(t.image.toString()); }
-  <INTO><TABLE><LPAREN>
-  tableName = identifier() { save.setOutput(tableName); }
-  <RPAREN>
-  {
-    return save;
-  }
-}
-
 List<String> getLiteralValues() :
 {
   List<String> values = new ArrayList<String>();
@@ -872,151 +768,11 @@
 }
 {
   (
-     ( t=<ID> | t=<META_TABLE> | t=<ROOT_TABLE> )
+     t=<ID>
      { return t.image.toString(); }
    | ( t=<QUOTED_IDENTIFIER> | t=<STRING_LITERAL> )
      { return t.image.substring(1,t.image.toString().length() - 1); }
   )
-}
-
-String booleanTerm() :
-{
-  String query = "";
-  String tmp = null;
-  String joinTerm = null;
-  String connector = null;
-}
-{
-  query = booleanTerms()
-  {
-    if(query.endsWith(".ROW")) {
-      joinTerm = query;
-      query = "";
-    }
-  }
-  (
-      (
-       <AND> { connector = " AND ";  }
-       | <OR> { connector = " OR "; }
-      ) tmp = booleanTerms() { 
-     if(tmp.endsWith(".ROW")) {
-      joinTerm = tmp; 
-     } else {
-       if(!query.equals(""))
-         query += connector;
-        query += tmp; 
-     }
-      }
-  )*
-  { 
-    if(joinTerm != null) {
-      return joinTerm + " BOOL " + query;
-    } else {
-      return query;
-    }
-  }
-}
-
-String booleanTerms() : 
-{
-  Token tSearchName, tComparand;
-  List<String> inList = new ArrayList<String>();
-  String searchName=null,comparator=null,comparand=null;
-  Token joinColumn = null;
-  Token joinKey = null;
-  String result = null;
-}
-{
-  ( 
-    tSearchName=<ID> { searchName = tSearchName.image.toString(); }
-    [
-      <DOT> 
-      (  
-        joinColumn=<ID>
-        { searchName += "." + joinColumn.image.toString(); }
-        | <ROW>
-        { 
-          secondR = searchName;
-          searchName += ".ROW";
-        }
-      )
-    ]
-  )
-  comparator = getComparator()
-  (
-     tComparand=<INTEGER_LITERAL> 
-      { comparand = tComparand.image.toString(); }
-    | tComparand=<STRING_LITERAL> 
-      { comparand = tComparand.image.substring(1,tComparand.image.length() - 1); }
-    | tComparand=<ID>
-     { comparand = tComparand.image.toString(); }
-      [
-        <DOT>
-      (
-          <ROW>
-          { 
-            secondR = comparand;
-            comparand += ".ROW"; 
-            }
-          | joinColumn=<ID>
-          { comparand += "." + joinColumn.image.toString(); }
-      )
-      ]
-    | inList = getColumns()
-    { 
-      if(comparator == null) {
-        comparator = "==";
-      }
-      comparand = "";
-      try{
-        for(int i=0; i<inList.size(); i++) {     
-          comparand += URLEncoder.encode(inList.get(i), "UTF-8");
-          if(inList.size() != (i+1)) { comparand += "|"; }
-        }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-    }
-  )
-   { 
-    if(searchName.endsWith(".ROW")) {
-      result = appendIndicator(comparand) 
-      + " " + comparator + " " + searchName;
-    } else {
-      result = appendIndicator(searchName) 
-      + " " + comparator + " " + comparand;
-    }
-    
-     return result; 
-   }
-}
-
-String getComparator() :
-{
-  Token t = null;
-  String comparator = null;
-}
-{
-  (  
-      t=<LCOMP> 
-        { comparator = t.image.toString(); } 
-      [<EQUALS> { comparator += "="; }]
-    | t=<RCOMP> 
-        { comparator = t.image.toString(); } 
-      [<EQUALS> { comparator += "="; }]
-    | t=<EQUALS> 
-        { comparator = t.image.toString(); }
-      [<LCOMP> { comparator = ">" + comparator; } ]
-      [<RCOMP> { comparator = "<" + comparator; } ]
-    | t=<NOTEQUAL>
-        { comparator = t.image.toString(); }
-    | <NOT><IN>
-        { comparator = "!!"; }
-    | <IN>
-        { comparator = "=="; }
-  )
-  
-  { return comparator; }
 }
 
 String appendIndicator(String columnName) :

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=608289&r1=608288&r2=608289&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 Wed Jan  2 16:06:38 2008
@@ -121,39 +121,6 @@
 
     load.put("EXIT", new String[] { "Exit shell", "EXIT;" });
 
-    // A Algebraic Query Commands
-    // this is a tentative query language based on a hbase which uses relational
-    // model of
-    // data.
-
-    load.put("TABLE",
-        new String[] { "Load a table", "A = table('table_name');" });
-    load.put("SUBSTITUTE", new String[] { "Substitute expression to [A~Z]",
-        "D = A.projection('cf_name1'[, 'cf_name2']);" });
-    load.put("SAVE", new String[] {
-        "Save results into specified table (It runs a mapreduce job)",
-        "SAVE A INTO table('table_name');" });
-
-    // Relational Operations
-    load.put("PROJECTION", new String[] {
-        "Selects a subset of the columnfamilies of a relation",
-        "A = TABLE('table_name');"
-            + " B = A.Projection('cf_name1'[, 'cf_name2']);" });
-    load
-        .put(
-            "SELECTION",
-            new String[] {
-                "Selects a subset of the rows in a relation that satisfy a selection condition (>, <, AND, OR, etc.)",
-                "A = Table('table_name');"
-                    + " B = A.Selection(cf_name1 > 100 [AND cf_name2 = 'string_value']);" });
-
-    // Aggregation Functions
-    // TODO : and apply aggregate function independently to each group of rows
-    load.put("GROUP", new String[] {
-        "Group rows by value of an attribute",
-        "A = Table('table_name');"
-            + " B = Group A by ('cf_name1'[, 'cf_name2']);" });
-
     return load;
   }
 

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=608289&r1=608288&r2=608289&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 Wed Jan  2 16:06:38 2008
@@ -45,7 +45,8 @@
     this(o, f, null);
   }
 
-  public ShowCommand(final Writer o, final TableFormatter f, final String argument) {
+  public ShowCommand(final Writer o, final TableFormatter f,
+      final String argument) {
     super(o);
     this.formatter = f;
     this.command = argument;
@@ -58,46 +59,18 @@
     try {
       HBaseAdmin admin = new HBaseAdmin(conf);
       int tableLength = 0;
-      if ("tables".equals(this.command)) {
-        HTableDescriptor[] tables = admin.listTables();
-        tableLength = tables.length;
-        if (tableLength == 0) {
-          return new ReturnMsg(0, "No tables found.");
-        }
-        formatter.header(HEADER);
-        for (int i = 0; i < tableLength; i++) {
-          String tableName = tables[i].getName().toString();
-          formatter.row(new String[] { tableName, tables[i].toString() });
-        }
-        formatter.footer();
-        return new ReturnMsg(1, tableLength + " table(s) in set.");
-      } else {
-        Map<String, VariableRef> refer = VariablesPool.get(command);
-        if (refer == null) {
-          return new ReturnMsg(0, "Unknown arguments.");
-        }
-
-        String msg = null;
-        for (Map.Entry<String, VariableRef> e : refer.entrySet()) {
-          msg = command + " = ";
-          if (e.getKey() != null) {
-            msg += e.getKey() + ".";
-          }
-          msg += e.getValue().getOperation() + "(";
-          if (e.getValue().getOperation().equals("projection")) {
-            String[] proj = e.getValue().getArgument().split(" ");
-            for (int i = 0; i < proj.length; i++) {
-              msg += "'" + proj[i] + "'";
-              if (i + 1 != proj.length)
-                msg += ", ";
-            }
-          } else {
-            msg += e.getValue().getArgument().replace(" BOOL ", " and ");
-          }
-          msg += ");\n";
-        }
-        return new ReturnMsg(0, msg);
+      HTableDescriptor[] tables = admin.listTables();
+      tableLength = tables.length;
+      if (tableLength == 0) {
+        return new ReturnMsg(0, "No tables found.");
+      }
+      formatter.header(HEADER);
+      for (int i = 0; i < tableLength; i++) {
+        String tableName = tables[i].getName().toString();
+        formatter.row(new String[] { tableName, tables[i].toString() });
       }
+      formatter.footer();
+      return new ReturnMsg(1, tableLength + " table(s) in set.");
     } catch (IOException e) {
       return new ReturnMsg(0, "error msg : " + e.toString());
     }

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=608289&r1=608288&r2=608289&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 Wed Jan  2 16:06:38 2008
@@ -75,9 +75,7 @@
     case SELECT:
     case ENABLE:
     case DISABLE:
-    case SAVE:
-    case ID:
-    case 71:
+    case 65:
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case HELP:
       case ALTER:
@@ -95,15 +93,13 @@
       case SELECT:
       case ENABLE:
       case DISABLE:
-      case SAVE:
-      case ID:
         statement = cmdStatement();
         break;
       default:
         jj_la1[0] = jj_gen;
         ;
       }
-      jj_consume_token(71);
+      jj_consume_token(65);
       break;
     case 0:
       jj_consume_token(0);
@@ -166,12 +162,6 @@
     case JAR:
       cmd = jarCommand();
       break;
-    case ID:
-      cmd = substituteCommand();
-      break;
-    case SAVE:
-      cmd = saveCommand();
-      break;
     default:
       jj_la1[2] = jj_gen;
       jj_consume_token(-1);
@@ -220,7 +210,6 @@
     label_2:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case DOT:
       case ID:
       case INTEGER_LITERAL:
       case FLOATING_POINT_LITERAL:
@@ -237,9 +226,6 @@
       case INTEGER_LITERAL:
         t = jj_consume_token(INTEGER_LITERAL);
         break;
-      case DOT:
-        t = jj_consume_token(DOT);
-        break;
       case FLOATING_POINT_LITERAL:
         t = jj_consume_token(FLOATING_POINT_LITERAL);
         break;
@@ -304,8 +290,6 @@
     case INSERT:
     case DELETE:
     case SELECT:
-    case SAVE:
-    case GROUP:
     case ID:
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case SHOW:
@@ -344,12 +328,6 @@
       case JAR:
         t = jj_consume_token(JAR);
         break;
-      case GROUP:
-        t = jj_consume_token(GROUP);
-        break;
-      case SAVE:
-        t = jj_consume_token(SAVE);
-        break;
       case ID:
         t = jj_consume_token(ID);
         break;
@@ -374,8 +352,6 @@
   String argument = null;
     jj_consume_token(SHOW);
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case META_TABLE:
-    case ROOT_TABLE:
     case ID:
     case QUOTED_IDENTIFIER:
     case STRING_LITERAL:
@@ -808,104 +784,6 @@
     throw new Error("Missing return statement in function");
   }
 
-  final public SubstituteCommand substituteCommand() throws ParseException {
-  Token key = null;
-  Token chainKey = null;
-  Token operation = null;
-  String tableName = null;
-  String condition = "";
-  List<String> notInList = new ArrayList<String>();
-  SubstituteCommand substitute = new SubstituteCommand(this.out);
-  Token extendedKey = null;
-    key = jj_consume_token(ID);
-    jj_consume_token(EQUALS);
-    substitute.setKey(key.image.toString());
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case ID:
-      chainKey = jj_consume_token(ID);
-      jj_consume_token(DOT);
-      substitute.setChainKey(chainKey.image.toString());
-      operation = jj_consume_token(ID);
-      substitute.setOperation(operation.image.toString());
-      jj_consume_token(LPAREN);
-      String operationType = operation.image.toLowerCase();
-      if(operationType.equals("projection")) {
-        List<String> columnList = columnList();
-        for (int i = 0; i < columnList.size(); i++) {
-          condition += appendIndicator(columnList.get(i)) + " ";
-        }
-
-      } else {
-        condition = booleanTerm();
-      }
-
-      substitute.setCondition(condition);
-      jj_consume_token(RPAREN);
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case AND:
-        jj_consume_token(AND);
-        extendedKey = jj_consume_token(ID);
-        String eKey = extendedKey.image.toString();
-        String cKey = chainKey.image.toString();
-        substitute.setCondition(condition);
-        if (secondR.equals(eKey)) {
-          substitute.resetVariableRelation(eKey, cKey);
-        } else {
-          substitute.resetVariableRelation(cKey, eKey);
-        }
-        break;
-      default:
-        jj_la1[27] = jj_gen;
-        ;
-      }
-      break;
-    case TABLE:
-      jj_consume_token(TABLE);
-      jj_consume_token(LPAREN);
-      tableName = identifier();
-      substitute.setInput(tableName);
-      jj_consume_token(RPAREN);
-      break;
-    case GROUP:
-      operation = jj_consume_token(GROUP);
-      chainKey = jj_consume_token(ID);
-      jj_consume_token(BY);
-      jj_consume_token(LPAREN);
-        List<String> columnList = columnList();
-        for (int i = 0; i < columnList.size(); i++) {
-          condition += appendIndicator(columnList.get(i));
-        }
-      jj_consume_token(RPAREN);
-      substitute.setChainKey(chainKey.image.toString());
-      substitute.setOperation(operation.image.toString());
-      substitute.setCondition(condition);
-      break;
-    default:
-      jj_la1[28] = jj_gen;
-      jj_consume_token(-1);
-      throw new ParseException();
-    }
-    {if (true) return substitute;}
-    throw new Error("Missing return statement in function");
-  }
-
-  final public SaveCommand saveCommand() throws ParseException {
-  Token t = null;
-  String tableName;
-  SaveCommand save = new SaveCommand(this.out);
-    jj_consume_token(SAVE);
-    t = jj_consume_token(ID);
-    save.setStatement(t.image.toString());
-    jj_consume_token(INTO);
-    jj_consume_token(TABLE);
-    jj_consume_token(LPAREN);
-    tableName = identifier();
-                             save.setOutput(tableName);
-    jj_consume_token(RPAREN);
-    {if (true) return save;}
-    throw new Error("Missing return statement in function");
-  }
-
   final public List<String> getLiteralValues() throws ParseException {
   List<String> values = new ArrayList<String>();
   String literal = null;
@@ -922,7 +800,7 @@
         ;
         break;
       default:
-        jj_la1[29] = jj_gen;
+        jj_la1[27] = jj_gen;
         break label_7;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -945,14 +823,14 @@
           jj_consume_token(QUOTED_IDENTIFIER);
           break;
         default:
-          jj_la1[30] = jj_gen;
+          jj_la1[28] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
        values.removeAll(values);
         break;
       default:
-        jj_la1[31] = jj_gen;
+        jj_la1[29] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -972,7 +850,7 @@
       s = jj_consume_token(QUOTED_IDENTIFIER);
       break;
     default:
-      jj_la1[32] = jj_gen;
+      jj_la1[30] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -998,7 +876,7 @@
         col = jj_consume_token(ASTERISK);
         break;
       default:
-        jj_la1[33] = jj_gen;
+        jj_la1[31] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -1014,14 +892,14 @@
         col = jj_consume_token(STRING_LITERAL);
         break;
       default:
-        jj_la1[34] = jj_gen;
+        jj_la1[32] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
         {if (true) return col.image.substring(1,col.image.toString().length() - 1);}
       break;
     default:
-      jj_la1[35] = jj_gen;
+      jj_la1[33] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1041,7 +919,7 @@
         ;
         break;
       default:
-        jj_la1[36] = jj_gen;
+        jj_la1[34] = jj_gen;
         break label_8;
       }
       jj_consume_token(COMMA);
@@ -1065,7 +943,7 @@
         ;
         break;
       default:
-        jj_la1[37] = jj_gen;
+        jj_la1[35] = jj_gen;
         break label_9;
       }
       jj_consume_token(COMMA);
@@ -1092,7 +970,7 @@
         ;
         break;
       default:
-        jj_la1[38] = jj_gen;
+        jj_la1[36] = jj_gen;
         break label_10;
       }
       jj_consume_token(COMMA);
@@ -1114,7 +992,7 @@
       t = jj_consume_token(INTEGER_LITERAL);
       break;
     default:
-      jj_la1[39] = jj_gen;
+      jj_la1[37] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1129,24 +1007,8 @@
   final public String identifier() throws ParseException {
   Token t = null;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case META_TABLE:
-    case ROOT_TABLE:
     case ID:
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case ID:
-        t = jj_consume_token(ID);
-        break;
-      case META_TABLE:
-        t = jj_consume_token(META_TABLE);
-        break;
-      case ROOT_TABLE:
-        t = jj_consume_token(ROOT_TABLE);
-        break;
-      default:
-        jj_la1[40] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
-      }
+      t = jj_consume_token(ID);
        {if (true) return t.image.toString();}
       break;
     case QUOTED_IDENTIFIER:
@@ -1159,244 +1021,17 @@
         t = jj_consume_token(STRING_LITERAL);
         break;
       default:
-        jj_la1[41] = jj_gen;
+        jj_la1[38] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
        {if (true) return t.image.substring(1,t.image.toString().length() - 1);}
       break;
     default:
-      jj_la1[42] = jj_gen;
-      jj_consume_token(-1);
-      throw new ParseException();
-    }
-    throw new Error("Missing return statement in function");
-  }
-
-  final public String booleanTerm() throws ParseException {
-  String query = "";
-  String tmp = null;
-  String joinTerm = null;
-  String connector = null;
-    query = booleanTerms();
-    if(query.endsWith(".ROW")) {
-      joinTerm = query;
-      query = "";
-    }
-    label_11:
-    while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case AND:
-      case OR:
-        ;
-        break;
-      default:
-        jj_la1[43] = jj_gen;
-        break label_11;
-      }
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case AND:
-        jj_consume_token(AND);
-               connector = " AND ";
-        break;
-      case OR:
-        jj_consume_token(OR);
-                connector = " OR ";
-        break;
-      default:
-        jj_la1[44] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
-      }
-      tmp = booleanTerms();
-     if(tmp.endsWith(".ROW")) {
-      joinTerm = tmp;
-     } else {
-       if(!query.equals(""))
-         query += connector;
-        query += tmp;
-     }
-    }
-    if(joinTerm != null) {
-      {if (true) return joinTerm + " BOOL " + query;}
-    } else {
-      {if (true) return query;}
-    }
-    throw new Error("Missing return statement in function");
-  }
-
-  final public String booleanTerms() throws ParseException {
-  Token tSearchName, tComparand;
-  List<String> inList = new ArrayList<String>();
-  String searchName=null,comparator=null,comparand=null;
-  Token joinColumn = null;
-  Token joinKey = null;
-  String result = null;
-    tSearchName = jj_consume_token(ID);
-                       searchName = tSearchName.image.toString();
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case DOT:
-      jj_consume_token(DOT);
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case ID:
-        joinColumn = jj_consume_token(ID);
-          searchName += "." + joinColumn.image.toString();
-        break;
-      case ROW:
-        jj_consume_token(ROW);
-          secondR = searchName;
-          searchName += ".ROW";
-        break;
-      default:
-        jj_la1[45] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
-      }
-      break;
-    default:
-      jj_la1[46] = jj_gen;
-      ;
-    }
-    comparator = getComparator();
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case INTEGER_LITERAL:
-      tComparand = jj_consume_token(INTEGER_LITERAL);
-        comparand = tComparand.image.toString();
-      break;
-    case STRING_LITERAL:
-      tComparand = jj_consume_token(STRING_LITERAL);
-        comparand = tComparand.image.substring(1,tComparand.image.length() - 1);
-      break;
-    case ID:
-      tComparand = jj_consume_token(ID);
-       comparand = tComparand.image.toString();
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case DOT:
-        jj_consume_token(DOT);
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-        case ROW:
-          jj_consume_token(ROW);
-            secondR = comparand;
-            comparand += ".ROW";
-          break;
-        case ID:
-          joinColumn = jj_consume_token(ID);
-            comparand += "." + joinColumn.image.toString();
-          break;
-        default:
-          jj_la1[47] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
-        }
-        break;
-      default:
-        jj_la1[48] = jj_gen;
-        ;
-      }
-      break;
-    case LPAREN:
-      inList = getColumns();
-      if(comparator == null) {
-        comparator = "==";
-      }
-      comparand = "";
-      try{
-        for(int i=0; i<inList.size(); i++) {
-          comparand += URLEncoder.encode(inList.get(i), "UTF-8");
-          if(inList.size() != (i+1)) { comparand += "|"; }
-        }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-      break;
-    default:
-      jj_la1[49] = jj_gen;
-      jj_consume_token(-1);
-      throw new ParseException();
-    }
-    if(searchName.endsWith(".ROW")) {
-      result = appendIndicator(comparand)
-      + " " + comparator + " " + searchName;
-    } else {
-      result = appendIndicator(searchName)
-      + " " + comparator + " " + comparand;
-    }
-
-     {if (true) return result;}
-    throw new Error("Missing return statement in function");
-  }
-
-  final public String getComparator() throws ParseException {
-  Token t = null;
-  String comparator = null;
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case LCOMP:
-      t = jj_consume_token(LCOMP);
-          comparator = t.image.toString();
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case EQUALS:
-        jj_consume_token(EQUALS);
-                  comparator += "=";
-        break;
-      default:
-        jj_la1[50] = jj_gen;
-        ;
-      }
-      break;
-    case RCOMP:
-      t = jj_consume_token(RCOMP);
-          comparator = t.image.toString();
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case EQUALS:
-        jj_consume_token(EQUALS);
-                  comparator += "=";
-        break;
-      default:
-        jj_la1[51] = jj_gen;
-        ;
-      }
-      break;
-    case EQUALS:
-      t = jj_consume_token(EQUALS);
-          comparator = t.image.toString();
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case LCOMP:
-        jj_consume_token(LCOMP);
-                 comparator = ">" + comparator;
-        break;
-      default:
-        jj_la1[52] = jj_gen;
-        ;
-      }
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case RCOMP:
-        jj_consume_token(RCOMP);
-                 comparator = "<" + comparator;
-        break;
-      default:
-        jj_la1[53] = jj_gen;
-        ;
-      }
-      break;
-    case NOTEQUAL:
-      t = jj_consume_token(NOTEQUAL);
-          comparator = t.image.toString();
-      break;
-    case NOT:
-      jj_consume_token(NOT);
-      jj_consume_token(IN);
-          comparator = "!!";
-      break;
-    case IN:
-      jj_consume_token(IN);
-          comparator = "==";
-      break;
-    default:
-      jj_la1[54] = jj_gen;
+      jj_la1[39] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
-    {if (true) return comparator;}
     throw new Error("Missing return statement in function");
   }
 
@@ -1414,45 +1049,37 @@
     finally { jj_save(0, xla); }
   }
 
-  final private boolean jj_3R_12() {
+  final private boolean jj_3R_13() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_13()) {
+    if (jj_scan_token(63)) {
     jj_scanpos = xsp;
-    if (jj_3R_14()) return true;
+    if (jj_scan_token(64)) return true;
     }
     return false;
   }
 
-  final private boolean jj_3R_14() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(69)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(70)) return true;
-    }
+  final private boolean jj_3_1() {
+    if (jj_scan_token(ADD)) return true;
+    if (jj_3R_11()) return true;
     return false;
   }
 
-  final private boolean jj_3R_13() {
+  final private boolean jj_3R_12() {
+    if (jj_scan_token(ID)) return true;
+    return false;
+  }
+
+  final private boolean jj_3R_11() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(65)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(60)) {
+    if (jj_3R_12()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(61)) return true;
-    }
+    if (jj_3R_13()) return true;
     }
     return false;
   }
 
-  final private boolean jj_3_1() {
-    if (jj_scan_token(ADD)) return true;
-    if (jj_3R_12()) return true;
-    return false;
-  }
-
   public ParserTokenManager token_source;
   SimpleCharStream jj_input_stream;
   public Token token, jj_nt;
@@ -1462,7 +1089,7 @@
   public boolean lookingAhead = false;
   private boolean jj_semLA;
   private int jj_gen;
-  final private int[] jj_la1 = new int[55];
+  final private int[] jj_la1 = new int[40];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static private int[] jj_la1_2;
@@ -1472,13 +1099,13 @@
       jj_la1_2();
    }
    private static void jj_la1_0() {
-      jj_la1_0 = new int[] {0x79ffe0,0x79ffe1,0x79ffe0,0x0,0x0,0x0,0x0,0x0,0x19fbc0,0x19fbc0,0x0,0x600,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x1000000,0x1800000,0x1800000,0x20000000,0x40000000,0x80000000,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x0,0x4000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+      jj_la1_0 = new int[] {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,};
    }
    private static void jj_la1_1() {
-      jj_la1_1 = new int[] {0x40000000,0x40000000,0x40000000,0x0,0x8,0x8,0x0,0x0,0xc0000000,0xc0000000,0x30000000,0x0,0x398e000,0x70000,0x700000,0x398e000,0x4,0x4,0xc000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x80000000,0x4,0x0,0x4,0x0,0x1000,0x0,0x1000,0x4,0x4,0x4,0x0,0x30000000,0x0,0x30000000,0x3,0x3,0x0,0x8,0x0,0x8,0x10,0x40,0x40,0x80,0x100,0xfc0,};
+      jj_la1_1 = new int[] {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,};
    }
    private static void jj_la1_2() {
-      jj_la1_2 = new int[] {0x2,0x82,0x2,0x2,0xe,0xe,0xe,0xe,0x2,0x2,0x62,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x60,0x60,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x62,0x62,0x62,0x60,0x6,0x60,0x66,0x0,0x0,0x0,0x6,0x2,0x60,0x62,0x0,0x0,0x2,0x0,0x2,0x0,0x46,0x0,0x0,0x0,0x0,0x0,};
+      jj_la1_2 = new int[] {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,};
    }
   final private JJCalls[] jj_2_rtns = new JJCalls[1];
   private boolean jj_rescan = false;
@@ -1493,7 +1120,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 55; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 40; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -1506,7 +1133,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 55; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 40; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -1516,7 +1143,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 55; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 40; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -1526,7 +1153,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 55; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 40; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -1535,7 +1162,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 55; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 40; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -1544,7 +1171,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 55; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 40; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -1655,15 +1282,15 @@
 
   public ParseException generateParseException() {
     jj_expentries.removeAllElements();
-    boolean[] la1tokens = new boolean[72];
-    for (int i = 0; i < 72; i++) {
+    boolean[] la1tokens = new boolean[66];
+    for (int i = 0; i < 66; i++) {
       la1tokens[i] = false;
     }
     if (jj_kind >= 0) {
       la1tokens[jj_kind] = true;
       jj_kind = -1;
     }
-    for (int i = 0; i < 55; i++) {
+    for (int i = 0; i < 40; i++) {
       if (jj_la1[i] == jj_gen) {
         for (int j = 0; j < 32; j++) {
           if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -1678,7 +1305,7 @@
         }
       }
     }
-    for (int i = 0; i < 72; i++) {
+    for (int i = 0; i < 66; 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=608289&r1=608288&r2=608289&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 Wed Jan  2 16:06:38 2008
@@ -34,42 +34,36 @@
   int AND = 32;
   int OR = 33;
   int COMMA = 34;
-  int DOT = 35;
-  int LPAREN = 36;
-  int RPAREN = 37;
-  int EQUALS = 38;
-  int LCOMP = 39;
-  int RCOMP = 40;
-  int NOT = 41;
-  int IN = 42;
-  int NOTEQUAL = 43;
-  int ASTERISK = 44;
-  int MAX_VERSIONS = 45;
-  int MAX_LENGTH = 46;
-  int COMPRESSION = 47;
-  int NONE = 48;
-  int BLOCK = 49;
-  int RECORD = 50;
-  int IN_MEMORY = 51;
-  int BLOOMFILTER = 52;
-  int COUNTING_BLOOMFILTER = 53;
-  int RETOUCHED_BLOOMFILTER = 54;
-  int VECTOR_SIZE = 55;
-  int NUM_HASH = 56;
-  int NUM_ENTRIES = 57;
-  int ADD = 58;
-  int CHANGE = 59;
-  int META_TABLE = 60;
-  int ROOT_TABLE = 61;
-  int SAVE = 62;
-  int GROUP = 63;
-  int BY = 64;
-  int ID = 65;
-  int INTEGER_LITERAL = 66;
-  int FLOATING_POINT_LITERAL = 67;
-  int EXPONENT = 68;
-  int QUOTED_IDENTIFIER = 69;
-  int STRING_LITERAL = 70;
+  int 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 DEFAULT = 0;
 
@@ -109,7 +103,6 @@
     "\"and\"",
     "\"or\"",
     "\",\"",
-    "\".\"",
     "\"(\"",
     "\")\"",
     "\"=\"",
@@ -134,11 +127,6 @@
     "\"num_entries\"",
     "\"add\"",
     "\"change\"",
-    "\".META.\"",
-    "\"-ROOT-\"",
-    "\"save\"",
-    "\"group\"",
-    "\"by\"",
     "<ID>",
     "<INTEGER_LITERAL>",
     "<FLOATING_POINT_LITERAL>",

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=608289&r1=608288&r2=608289&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserTokenManager.java (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserTokenManager.java Wed Jan  2 16:06:38 2008
@@ -40,196 +40,194 @@
    switch (pos)
    {
       case 0:
-         if ((active0 & 0xefffe603ffffffe0L) != 0L || (active1 & 0x1L) != 0L)
+         if ((active0 & 0x7fff303ffffffe0L) != 0L)
          {
-            jjmatchedKind = 65;
+            jjmatchedKind = 59;
             return 1;
          }
-         if ((active0 & 0x1000000800000000L) != 0L)
-            return 3;
          return -1;
       case 1:
-         if ((active0 & 0xeff7e201fffcdfe0L) != 0L)
+         if ((active0 & 0x4020200032000L) != 0L)
+            return 1;
+         if ((active0 & 0x7fbf101fffcdfe0L) != 0L)
          {
             if (jjmatchedPos != 1)
             {
-               jjmatchedKind = 65;
+               jjmatchedKind = 59;
                jjmatchedPos = 1;
             }
             return 1;
          }
-         if ((active0 & 0x8040200032000L) != 0L || (active1 & 0x1L) != 0L)
-            return 1;
          return -1;
       case 2:
-         if ((active0 & 0xebffe000fbff9fe0L) != 0L)
+         if ((active0 & 0x200010104004000L) != 0L)
+            return 1;
+         if ((active0 & 0x5fff000fbff9fe0L) != 0L)
          {
-            jjmatchedKind = 65;
+            jjmatchedKind = 59;
             jjmatchedPos = 2;
             return 1;
          }
-         if ((active0 & 0x400020104004000L) != 0L)
-            return 1;
          return -1;
       case 3:
-         if ((active0 & 0xabfee000f9fd08c0L) != 0L)
+         if ((active0 & 0x800002029720L) != 0L)
+            return 1;
+         if ((active0 & 0x5ff7000f9fd08c0L) != 0L)
          {
             if (jjmatchedPos != 3)
             {
-               jjmatchedKind = 65;
+               jjmatchedKind = 59;
                jjmatchedPos = 3;
             }
             return 1;
          }
-         if ((active0 & 0x4001000002029720L) != 0L)
-            return 1;
          return -1;
       case 4:
-         if ((active0 & 0x2bfce00078f90a00L) != 0L)
+         if ((active0 & 0x10000810400c0L) != 0L)
+            return 1;
+         if ((active0 & 0x5fe700078f90a00L) != 0L)
          {
-            jjmatchedKind = 65;
+            jjmatchedKind = 59;
             jjmatchedPos = 4;
             return 1;
          }
-         if ((active0 & 0x80020000810400c0L) != 0L)
-            return 1;
          return -1;
       case 5:
-         if ((active0 & 0x3f8e00070c00200L) != 0L)
+         if ((active0 & 0x402000008390800L) != 0L)
+            return 1;
+         if ((active0 & 0x1fc700070c00200L) != 0L)
          {
-            jjmatchedKind = 65;
+            jjmatchedKind = 59;
             jjmatchedPos = 5;
             return 1;
          }
-         if ((active0 & 0x2804000008390800L) != 0L)
-            return 1;
          return -1;
       case 6:
          if ((active0 & 0x400000L) != 0L)
             return 1;
-         if ((active0 & 0x3f8e00070800200L) != 0L)
+         if ((active0 & 0x1fc700070800200L) != 0L)
          {
-            jjmatchedKind = 65;
+            jjmatchedKind = 59;
             jjmatchedPos = 6;
             return 1;
          }
          return -1;
       case 7:
-         if ((active0 & 0x100000000800200L) != 0L)
-            return 1;
-         if ((active0 & 0x2f8e00070000000L) != 0L)
+         if ((active0 & 0x17c700070000000L) != 0L)
          {
-            jjmatchedKind = 65;
+            jjmatchedKind = 59;
             jjmatchedPos = 7;
             return 1;
          }
+         if ((active0 & 0x80000000800200L) != 0L)
+            return 1;
          return -1;
       case 8:
-         if ((active0 & 0x8000020000000L) != 0L)
-            return 1;
-         if ((active0 & 0x2f0e00050000000L) != 0L)
+         if ((active0 & 0x178700050000000L) != 0L)
          {
-            jjmatchedKind = 65;
+            jjmatchedKind = 59;
             jjmatchedPos = 8;
             return 1;
          }
+         if ((active0 & 0x4000020000000L) != 0L)
+            return 1;
          return -1;
       case 9:
-         if ((active0 & 0x400000000000L) != 0L)
-            return 1;
-         if ((active0 & 0x2f0a00050000000L) != 0L)
+         if ((active0 & 0x178500050000000L) != 0L)
          {
-            jjmatchedKind = 65;
+            jjmatchedKind = 59;
             jjmatchedPos = 9;
             return 1;
          }
+         if ((active0 & 0x200000000000L) != 0L)
+            return 1;
          return -1;
       case 10:
-         if ((active0 & 0x290800000000000L) != 0L)
+         if ((active0 & 0x148400000000000L) != 0L)
             return 1;
-         if ((active0 & 0x60200050000000L) != 0L)
+         if ((active0 & 0x30100050000000L) != 0L)
          {
-            jjmatchedKind = 65;
+            jjmatchedKind = 59;
             jjmatchedPos = 10;
             return 1;
          }
          return -1;
       case 11:
-         if ((active0 & 0x200040000000L) != 0L)
+         if ((active0 & 0x100040000000L) != 0L)
             return 1;
-         if ((active0 & 0x60000010000000L) != 0L)
+         if ((active0 & 0x30000010000000L) != 0L)
          {
-            jjmatchedKind = 65;
+            jjmatchedKind = 59;
             jjmatchedPos = 11;
             return 1;
          }
          return -1;
       case 12:
-         if ((active0 & 0x60000010000000L) != 0L)
+         if ((active0 & 0x30000010000000L) != 0L)
          {
-            jjmatchedKind = 65;
+            jjmatchedKind = 59;
             jjmatchedPos = 12;
             return 1;
          }
          return -1;
       case 13:
-         if ((active0 & 0x10000000L) != 0L)
-            return 1;
-         if ((active0 & 0x60000000000000L) != 0L)
+         if ((active0 & 0x30000000000000L) != 0L)
          {
-            jjmatchedKind = 65;
+            jjmatchedKind = 59;
             jjmatchedPos = 13;
             return 1;
          }
+         if ((active0 & 0x10000000L) != 0L)
+            return 1;
          return -1;
       case 14:
-         if ((active0 & 0x60000000000000L) != 0L)
+         if ((active0 & 0x30000000000000L) != 0L)
          {
-            jjmatchedKind = 65;
+            jjmatchedKind = 59;
             jjmatchedPos = 14;
             return 1;
          }
          return -1;
       case 15:
-         if ((active0 & 0x60000000000000L) != 0L)
+         if ((active0 & 0x30000000000000L) != 0L)
          {
-            jjmatchedKind = 65;
+            jjmatchedKind = 59;
             jjmatchedPos = 15;
             return 1;
          }
          return -1;
       case 16:
-         if ((active0 & 0x60000000000000L) != 0L)
+         if ((active0 & 0x30000000000000L) != 0L)
          {
-            jjmatchedKind = 65;
+            jjmatchedKind = 59;
             jjmatchedPos = 16;
             return 1;
          }
          return -1;
       case 17:
-         if ((active0 & 0x60000000000000L) != 0L)
+         if ((active0 & 0x30000000000000L) != 0L)
          {
-            jjmatchedKind = 65;
+            jjmatchedKind = 59;
             jjmatchedPos = 17;
             return 1;
          }
          return -1;
       case 18:
-         if ((active0 & 0x60000000000000L) != 0L)
+         if ((active0 & 0x30000000000000L) != 0L)
          {
-            jjmatchedKind = 65;
+            jjmatchedKind = 59;
             jjmatchedPos = 18;
             return 1;
          }
          return -1;
       case 19:
-         if ((active0 & 0x40000000000000L) != 0L)
+         if ((active0 & 0x20000000000000L) != 0L)
          {
-            jjmatchedKind = 65;
+            jjmatchedKind = 59;
             jjmatchedPos = 19;
             return 1;
          }
-         if ((active0 & 0x20000000000000L) != 0L)
+         if ((active0 & 0x10000000000000L) != 0L)
             return 1;
          return -1;
       default :
@@ -259,139 +257,128 @@
    switch(curChar)
    {
       case 33:
-         return jjMoveStringLiteralDfa1_0(0x80000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x40000000000L);
       case 40:
-         return jjStopAtPos(0, 36);
+         return jjStopAtPos(0, 35);
       case 41:
-         return jjStopAtPos(0, 37);
+         return jjStopAtPos(0, 36);
       case 42:
-         return jjStopAtPos(0, 44);
+         return jjStopAtPos(0, 43);
       case 44:
          return jjStopAtPos(0, 34);
-      case 45:
-         return jjMoveStringLiteralDfa1_0(0x2000000000000000L, 0x0L);
-      case 46:
-         jjmatchedKind = 35;
-         return jjMoveStringLiteralDfa1_0(0x1000000000000000L, 0x0L);
       case 59:
-         return jjStopAtPos(0, 71);
+         return jjStopAtPos(0, 65);
       case 60:
-         return jjStopAtPos(0, 40);
+         return jjStopAtPos(0, 39);
       case 61:
-         return jjStopAtPos(0, 38);
+         return jjStopAtPos(0, 37);
       case 62:
-         return jjStopAtPos(0, 39);
+         return jjStopAtPos(0, 38);
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa1_0(0x400000100000040L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x200000100000040L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa1_0(0x12000000000000L, 0x1L);
+         return jjMoveStringLiteralDfa1_0(0x9000000000000L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa1_0(0x820800010000880L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x410400010000880L);
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa1_0(0x481600L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x481600L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa1_0(0x208000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x208000L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa1_0(0x2002000L, 0x0L);
-      case 71:
-      case 103:
-         return jjMoveStringLiteralDfa1_0(0x8000000000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x2002000L);
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa1_0(0x20L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x20L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa1_0(0x8040000030000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x4020000030000L);
       case 74:
       case 106:
-         return jjMoveStringLiteralDfa1_0(0x4000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x4000L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa1_0(0x80000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x80000000L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa1_0(0x600000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x300000000000L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa1_0(0x301020040000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x180810040000000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa1_0(0x200000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x200000000L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa1_0(0x44000004000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x22000004000000L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa1_0(0x4000000000900100L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x900100L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa1_0(0x20040000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x20040000L);
       case 86:
       case 118:
-         return jjMoveStringLiteralDfa1_0(0x80000008000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x40000008000000L);
       case 87:
       case 119:
-         return jjMoveStringLiteralDfa1_0(0x1000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x1000000L);
       default :
          return jjMoveNfa_0(0, 0);
    }
 }
-private final int jjMoveStringLiteralDfa1_0(long active0, long active1)
+private final int jjMoveStringLiteralDfa1_0(long active0)
 {
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_0(0, active0, active1);
+      jjStopStringLiteralDfa_0(0, active0, 0L);
       return 1;
    }
    switch(curChar)
    {
       case 61:
-         if ((active0 & 0x80000000000L) != 0L)
-            return jjStopAtPos(1, 43);
+         if ((active0 & 0x40000000000L) != 0L)
+            return jjStopAtPos(1, 42);
          break;
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa2_0(active0, 0x4000600008044000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x300008044000L);
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa2_0(active0, 0x400000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x200000000000000L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa2_0(active0, 0xc4000000180620L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x62000000180620L);
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa2_0(active0, 0x800000001000100L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x400000001000100L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa2_0(active0, 0xa0400000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0xa0400000L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa2_0(active0, 0x120000000000c0L, active1, 0L);
-      case 77:
-      case 109:
-         return jjMoveStringLiteralDfa2_0(active0, 0x1000000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x90000000000c0L);
       case 78:
       case 110:
-         if ((active0 & 0x40000000000L) != 0L)
+         if ((active0 & 0x20000000000L) != 0L)
          {
-            jjmatchedKind = 42;
+            jjmatchedKind = 41;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x8000100230000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x4000100230000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa2_0(active0, 0x21820014000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x10c10014000000L);
       case 82:
       case 114:
          if ((active0 & 0x200000000L) != 0L)
             return jjStartNfaWithStates_0(1, 33, 1);
-         return jjMoveStringLiteralDfa2_0(active0, 0xa000000002001800L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x2001800L);
       case 83:
       case 115:
          if ((active0 & 0x2000L) != 0L)
@@ -399,27 +386,22 @@
          break;
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa2_0(active0, 0x800000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x800000L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa2_0(active0, 0x300000040000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x180000040000000L);
       case 88:
       case 120:
-         return jjMoveStringLiteralDfa2_0(active0, 0x8000L, active1, 0L);
-      case 89:
-      case 121:
-         if ((active1 & 0x1L) != 0L)
-            return jjStartNfaWithStates_0(1, 64, 1);
-         break;
+         return jjMoveStringLiteralDfa2_0(active0, 0x8000L);
       default :
          break;
    }
-   return jjStartNfa_0(0, active0, active1);
+   return jjStartNfa_0(0, active0, 0L);
 }
-private final int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long active1)
+private final int jjMoveStringLiteralDfa2_0(long old0, long active0)
 {
-   if (((active0 &= old0) | (active1 &= old1)) == 0L)
-      return jjStartNfa_0(0, old0, old1); 
+   if (((active0 &= old0)) == 0L)
+      return jjStartNfa_0(0, old0, 0L);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
       jjStopStringLiteralDfa_0(1, active0, 0L);
@@ -428,26 +410,26 @@
    switch(curChar)
    {
       case 95:
-         return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000L);
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa3_0(active0, 0x800000000a00000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x400000000a00000L);
       case 66:
       case 98:
          return jjMoveStringLiteralDfa3_0(active0, 0x40000L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa3_0(active0, 0x84000000000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x42000000000000L);
       case 68:
       case 100:
          if ((active0 & 0x100000000L) != 0L)
             return jjStartNfaWithStates_0(2, 32, 1);
-         else if ((active0 & 0x400000000000000L) != 0L)
-            return jjStartNfaWithStates_0(2, 58, 1);
+         else if ((active0 & 0x200000000000000L) != 0L)
+            return jjStartNfaWithStates_0(2, 57, 1);
          break;
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa3_0(active0, 0x1000000001000880L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1000880L);
       case 73:
       case 105:
          return jjMoveStringLiteralDfa3_0(active0, 0x8000L);
@@ -456,13 +438,13 @@
          return jjMoveStringLiteralDfa3_0(active0, 0x18180020L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa3_0(active0, 0x3008000e0000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1804000e0000000L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa3_0(active0, 0x1000000000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x800000000000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa3_0(active0, 0xa012000002001100L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x9000002001100L);
       case 82:
       case 114:
          if ((active0 & 0x4000L) != 0L)
@@ -473,15 +455,12 @@
          return jjMoveStringLiteralDfa3_0(active0, 0x410600L);
       case 84:
       case 116:
-         if ((active0 & 0x20000000000L) != 0L)
-            return jjStartNfaWithStates_0(2, 41, 1);
-         return jjMoveStringLiteralDfa3_0(active0, 0x40000000020040L);
+         if ((active0 & 0x10000000000L) != 0L)
+            return jjStartNfaWithStates_0(2, 40, 1);
+         return jjMoveStringLiteralDfa3_0(active0, 0x20000000020040L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa3_0(active0, 0x20000000000000L);
-      case 86:
-      case 118:
-         return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x10000000000000L);
       case 87:
       case 119:
          if ((active0 & 0x4000000L) != 0L)
@@ -489,7 +468,7 @@
          break;
       case 88:
       case 120:
-         return jjMoveStringLiteralDfa3_0(active0, 0x600000000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x300000000000L);
       default :
          break;
    }
@@ -507,7 +486,7 @@
    switch(curChar)
    {
       case 95:
-         return jjMoveStringLiteralDfa4_0(active0, 0x300600040000000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x180300040000000L);
       case 65:
       case 97:
          return jjMoveStringLiteralDfa4_0(active0, 0x400880L);
@@ -521,13 +500,11 @@
             jjmatchedKind = 10;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x2000000000200L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x1000000000200L);
       case 69:
       case 101:
-         if ((active0 & 0x1000000000000L) != 0L)
-            return jjStartNfaWithStates_0(3, 48, 1);
-         else if ((active0 & 0x4000000000000000L) != 0L)
-            return jjStartNfaWithStates_0(3, 62, 1);
+         if ((active0 & 0x800000000000L) != 0L)
+            return jjStartNfaWithStates_0(3, 47, 1);
          return jjMoveStringLiteralDfa4_0(active0, 0x20190040L);
       case 73:
       case 105:
@@ -539,22 +516,22 @@
       case 109:
          if ((active0 & 0x2000000L) != 0L)
             return jjStartNfaWithStates_0(3, 25, 1);
-         return jjMoveStringLiteralDfa4_0(active0, 0x8000000000000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa4_0(active0, 0x820000000000000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x410000000000000L);
       case 79:
       case 111:
          if ((active0 & 0x20000L) != 0L)
             return jjStartNfaWithStates_0(3, 17, 1);
-         return jjMoveStringLiteralDfa4_0(active0, 0x2054000000000000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x2a000000000000L);
       case 80:
       case 112:
          if ((active0 & 0x20L) != 0L)
             return jjStartNfaWithStates_0(3, 5, 1);
          else if ((active0 & 0x1000L) != 0L)
             return jjStartNfaWithStates_0(3, 12, 1);
-         return jjMoveStringLiteralDfa4_0(active0, 0x800000000000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x400000000000L);
       case 82:
       case 114:
          return jjMoveStringLiteralDfa4_0(active0, 0x1800000L);
@@ -562,10 +539,10 @@
       case 116:
          if ((active0 & 0x8000L) != 0L)
             return jjStartNfaWithStates_0(3, 15, 1);
-         return jjMoveStringLiteralDfa4_0(active0, 0x1080000000000000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x40000000000000L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa4_0(active0, 0x8000000018000000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x18000000L);
       case 87:
       case 119:
          if ((active0 & 0x100L) != 0L)
@@ -587,9 +564,6 @@
    }
    switch(curChar)
    {
-      case 65:
-      case 97:
-         return jjMoveStringLiteralDfa5_0(active0, 0x1000000000000000L);
       case 66:
       case 98:
          return jjMoveStringLiteralDfa5_0(active0, 0x400000L);
@@ -602,39 +576,34 @@
             return jjStartNfaWithStates_0(4, 18, 1);
          else if ((active0 & 0x1000000L) != 0L)
             return jjStartNfaWithStates_0(4, 24, 1);
-         return jjMoveStringLiteralDfa5_0(active0, 0x208000008000000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x104000008000000L);
       case 71:
       case 103:
-         return jjMoveStringLiteralDfa5_0(active0, 0x800000000000000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x400000000000000L);
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa5_0(active0, 0x100000000000000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x80000000000000L);
       case 75:
       case 107:
-         if ((active0 & 0x2000000000000L) != 0L)
-            return jjStartNfaWithStates_0(4, 49, 1);
+         if ((active0 & 0x1000000000000L) != 0L)
+            return jjStartNfaWithStates_0(4, 48, 1);
          break;
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa5_0(active0, 0x400000200000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x200000200000L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa5_0(active0, 0x10000010000000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x8000010000000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa5_0(active0, 0x80000000000000L);
-      case 80:
-      case 112:
-         if ((active0 & 0x8000000000000000L) != 0L)
-            return jjStartNfaWithStates_0(4, 63, 1);
-         break;
+         return jjMoveStringLiteralDfa5_0(active0, 0x40000000000000L);
       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, 0x4800000010200L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x2400000010200L);
       case 83:
       case 115:
          return jjMoveStringLiteralDfa5_0(active0, 0x20000000L);
@@ -642,13 +611,13 @@
       case 116:
          if ((active0 & 0x80000000L) != 0L)
             return jjStartNfaWithStates_0(4, 31, 1);
-         return jjMoveStringLiteralDfa5_0(active0, 0x2020000000880800L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x10000000880800L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa5_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x20000000000000L);
       case 86:
       case 118:
-         return jjMoveStringLiteralDfa5_0(active0, 0x200040000000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x100040000000L);
       default :
          break;
    }
@@ -665,24 +634,16 @@
    }
    switch(curChar)
    {
-      case 45:
-         if ((active0 & 0x2000000000000000L) != 0L)
-            return jjStartNfaWithStates_0(5, 61, 1);
-         break;
-      case 46:
-         if ((active0 & 0x1000000000000000L) != 0L)
-            return jjStopAtPos(5, 60);
-         break;
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa6_0(active0, 0x100000000000000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x80000000000000L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa6_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x20000000000000L);
       case 68:
       case 100:
-         if ((active0 & 0x4000000000000L) != 0L)
-            return jjStartNfaWithStates_0(5, 50, 1);
+         if ((active0 & 0x2000000000000L) != 0L)
+            return jjStartNfaWithStates_0(5, 49, 1);
          break;
       case 69:
       case 101:
@@ -692,27 +653,27 @@
             return jjStartNfaWithStates_0(5, 19, 1);
          else if ((active0 & 0x200000L) != 0L)
             return jjStartNfaWithStates_0(5, 21, 1);
-         else if ((active0 & 0x800000000000000L) != 0L)
-            return jjStartNfaWithStates_0(5, 59, 1);
-         return jjMoveStringLiteralDfa6_0(active0, 0xe00040000000L);
+         else if ((active0 & 0x400000000000000L) != 0L)
+            return jjStartNfaWithStates_0(5, 58, 1);
+         return jjMoveStringLiteralDfa6_0(active0, 0x700040000000L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa6_0(active0, 0x10000000000000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x8000000000000L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa6_0(active0, 0x20000000800200L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x10000000800200L);
       case 76:
       case 108:
          return jjMoveStringLiteralDfa6_0(active0, 0x400000L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa6_0(active0, 0x8000000000000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x4000000000000L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa6_0(active0, 0x200000010000000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x100000010000000L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa6_0(active0, 0x80000000000000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x40000000000000L);
       case 83:
       case 115:
          if ((active0 & 0x8000000L) != 0L)
@@ -742,7 +703,7 @@
    switch(curChar)
    {
       case 95:
-         return jjMoveStringLiteralDfa7_0(active0, 0x80000000000000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x40000000000000L);
       case 65:
       case 97:
          return jjMoveStringLiteralDfa7_0(active0, 0x20000000L);
@@ -759,25 +720,25 @@
          return jjMoveStringLiteralDfa7_0(active0, 0x10000000L);
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa7_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x20000000000000L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa7_0(active0, 0x10000000000000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x8000000000000L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa7_0(active0, 0x20400000800000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x10200000800000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa7_0(active0, 0x8000000000000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x4000000000000L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa7_0(active0, 0x200040000000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x100040000000L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa7_0(active0, 0x100800000000000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x80400000000000L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa7_0(active0, 0x200000000000000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x100000000000000L);
       default :
          break;
    }
@@ -801,29 +762,29 @@
       case 101:
          if ((active0 & 0x200L) != 0L)
             return jjStartNfaWithStates_0(7, 9, 1);
-         return jjMoveStringLiteralDfa8_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x20000000000000L);
       case 71:
       case 103:
          if ((active0 & 0x800000L) != 0L)
             return jjStartNfaWithStates_0(7, 23, 1);
-         return jjMoveStringLiteralDfa8_0(active0, 0x20400000000000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x10200000000000L);
       case 72:
       case 104:
-         if ((active0 & 0x100000000000000L) != 0L)
-            return jjStartNfaWithStates_0(7, 56, 1);
+         if ((active0 & 0x80000000000000L) != 0L)
+            return jjStartNfaWithStates_0(7, 55, 1);
          break;
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa8_0(active0, 0x10000000000000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x8000000000000L);
       case 77:
       case 109:
          return jjMoveStringLiteralDfa8_0(active0, 0x20000000L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa8_0(active0, 0x208000000000000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x104000000000000L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa8_0(active0, 0x80a00040000000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x40500040000000L);
       default :
          break;
    }
@@ -841,13 +802,13 @@
    switch(curChar)
    {
       case 95:
-         return jjMoveStringLiteralDfa9_0(active0, 0x20000000000000L);
+         return jjMoveStringLiteralDfa9_0(active0, 0x10000000000000L);
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa9_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa9_0(active0, 0x20000000000000L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa9_0(active0, 0x280a00040000000L);
+         return jjMoveStringLiteralDfa9_0(active0, 0x140500040000000L);
       case 77:
       case 109:
          return jjMoveStringLiteralDfa9_0(active0, 0x10000000L);
@@ -858,11 +819,11 @@
          break;
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa9_0(active0, 0x10400000000000L);
+         return jjMoveStringLiteralDfa9_0(active0, 0x8200000000000L);
       case 89:
       case 121:
-         if ((active0 & 0x8000000000000L) != 0L)
-            return jjStartNfaWithStates_0(8, 51, 1);
+         if ((active0 & 0x4000000000000L) != 0L)
+            return jjStartNfaWithStates_0(8, 50, 1);
          break;
       default :
          break;
@@ -881,27 +842,27 @@
    switch(curChar)
    {
       case 95:
-         return jjMoveStringLiteralDfa10_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa10_0(active0, 0x20000000000000L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa10_0(active0, 0x20000000000000L);
+         return jjMoveStringLiteralDfa10_0(active0, 0x10000000000000L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa10_0(active0, 0x210000000000000L);
+         return jjMoveStringLiteralDfa10_0(active0, 0x108000000000000L);
       case 72:
       case 104:
-         if ((active0 & 0x400000000000L) != 0L)
-            return jjStartNfaWithStates_0(9, 46, 1);
+         if ((active0 & 0x200000000000L) != 0L)
+            return jjStartNfaWithStates_0(9, 45, 1);
          break;
       case 73:
       case 105:
          return jjMoveStringLiteralDfa10_0(active0, 0x10000000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa10_0(active0, 0xa00040000000L);
+         return jjMoveStringLiteralDfa10_0(active0, 0x500040000000L);
       case 90:
       case 122:
-         return jjMoveStringLiteralDfa10_0(active0, 0x80000000000000L);
+         return jjMoveStringLiteralDfa10_0(active0, 0x40000000000000L);
       default :
          break;
    }
@@ -920,29 +881,29 @@
    {
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa11_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa11_0(active0, 0x20000000000000L);
       case 69:
       case 101:
-         if ((active0 & 0x80000000000000L) != 0L)
-            return jjStartNfaWithStates_0(10, 55, 1);
+         if ((active0 & 0x40000000000000L) != 0L)
+            return jjStartNfaWithStates_0(10, 54, 1);
          break;
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa11_0(active0, 0x20000010000000L);
+         return jjMoveStringLiteralDfa11_0(active0, 0x10000010000000L);
       case 78:
       case 110:
-         if ((active0 & 0x800000000000L) != 0L)
-            return jjStartNfaWithStates_0(10, 47, 1);
-         return jjMoveStringLiteralDfa11_0(active0, 0x200040000000L);
+         if ((active0 & 0x400000000000L) != 0L)
+            return jjStartNfaWithStates_0(10, 46, 1);
+         return jjMoveStringLiteralDfa11_0(active0, 0x100040000000L);
       case 82:
       case 114:
-         if ((active0 & 0x10000000000000L) != 0L)
-            return jjStartNfaWithStates_0(10, 52, 1);
+         if ((active0 & 0x8000000000000L) != 0L)
+            return jjStartNfaWithStates_0(10, 51, 1);
          break;
       case 83:
       case 115:
-         if ((active0 & 0x200000000000000L) != 0L)
-            return jjStartNfaWithStates_0(10, 57, 1);
+         if ((active0 & 0x100000000000000L) != 0L)
+            return jjStartNfaWithStates_0(10, 56, 1);
          break;
       default :
          break;
@@ -965,16 +926,16 @@
          return jjMoveStringLiteralDfa12_0(active0, 0x10000000L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa12_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa12_0(active0, 0x20000000000000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa12_0(active0, 0x20000000000000L);
+         return jjMoveStringLiteralDfa12_0(active0, 0x10000000000000L);
       case 83:
       case 115:
          if ((active0 & 0x40000000L) != 0L)
             return jjStartNfaWithStates_0(11, 30, 1);
-         else if ((active0 & 0x200000000000L) != 0L)
-            return jjStartNfaWithStates_0(11, 45, 1);
+         else if ((active0 & 0x100000000000L) != 0L)
+            return jjStartNfaWithStates_0(11, 44, 1);
          break;
       default :
          break;
@@ -997,7 +958,7 @@
          return jjMoveStringLiteralDfa13_0(active0, 0x10000000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa13_0(active0, 0x60000000000000L);
+         return jjMoveStringLiteralDfa13_0(active0, 0x30000000000000L);
       default :
          break;
    }
@@ -1016,10 +977,10 @@
    {
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa14_0(active0, 0x20000000000000L);
+         return jjMoveStringLiteralDfa14_0(active0, 0x10000000000000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa14_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa14_0(active0, 0x20000000000000L);
       case 83:
       case 115:
          if ((active0 & 0x10000000L) != 0L)
@@ -1043,10 +1004,10 @@
    {
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa15_0(active0, 0x20000000000000L);
+         return jjMoveStringLiteralDfa15_0(active0, 0x10000000000000L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa15_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa15_0(active0, 0x20000000000000L);
       default :
          break;
    }
@@ -1065,10 +1026,10 @@
    {
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa16_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa16_0(active0, 0x20000000000000L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa16_0(active0, 0x20000000000000L);
+         return jjMoveStringLiteralDfa16_0(active0, 0x10000000000000L);
       default :
          break;
    }
@@ -1087,10 +1048,10 @@
    {
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa17_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa17_0(active0, 0x20000000000000L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa17_0(active0, 0x20000000000000L);
+         return jjMoveStringLiteralDfa17_0(active0, 0x10000000000000L);
       default :
          break;
    }
@@ -1109,10 +1070,10 @@
    {
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa18_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa18_0(active0, 0x20000000000000L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa18_0(active0, 0x20000000000000L);
+         return jjMoveStringLiteralDfa18_0(active0, 0x10000000000000L);
       default :
          break;
    }
@@ -1131,10 +1092,10 @@
    {
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa19_0(active0, 0x20000000000000L);
+         return jjMoveStringLiteralDfa19_0(active0, 0x10000000000000L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa19_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa19_0(active0, 0x20000000000000L);
       default :
          break;
    }
@@ -1153,11 +1114,11 @@
    {
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa20_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa20_0(active0, 0x20000000000000L);
       case 82:
       case 114:
-         if ((active0 & 0x20000000000000L) != 0L)
-            return jjStartNfaWithStates_0(19, 53, 1);
+         if ((active0 & 0x10000000000000L) != 0L)
+            return jjStartNfaWithStates_0(19, 52, 1);
          break;
       default :
          break;
@@ -1177,8 +1138,8 @@
    {
       case 82:
       case 114:
-         if ((active0 & 0x40000000000000L) != 0L)
-            return jjStartNfaWithStates_0(20, 54, 1);
+         if ((active0 & 0x20000000000000L) != 0L)
+            return jjStartNfaWithStates_0(20, 53, 1);
          break;
       default :
          break;
@@ -1240,28 +1201,28 @@
                case 0:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 66)
-                        kind = 66;
+                     if (kind > 60)
+                        kind = 60;
                      jjCheckNAddStates(0, 6);
                   }
-                  else if ((0x400a00000000000L & l) != 0L)
+                  else if ((0x400e00000000000L & l) != 0L)
                   {
-                     if (kind > 65)
-                        kind = 65;
+                     if (kind > 59)
+                        kind = 59;
                      jjCheckNAdd(1);
                   }
                   else if (curChar == 39)
                      jjCheckNAddStates(7, 9);
                   else if (curChar == 34)
                      jjCheckNAdd(8);
-                  else if (curChar == 46)
+                  if (curChar == 46)
                      jjCheckNAdd(3);
                   break;
                case 1:
-                  if ((0x7ffa00000000000L & l) == 0L)
+                  if ((0x7ffe00000000000L & l) == 0L)
                      break;
-                  if (kind > 65)
-                     kind = 65;
+                  if (kind > 59)
+                     kind = 59;
                   jjCheckNAdd(1);
                   break;
                case 2:
@@ -1271,8 +1232,8 @@
                case 3:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 61)
+                     kind = 61;
                   jjCheckNAddTwoStates(3, 4);
                   break;
                case 5:
@@ -1282,8 +1243,8 @@
                case 6:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 61)
+                     kind = 61;
                   jjCheckNAdd(6);
                   break;
                case 7:
@@ -1295,8 +1256,8 @@
                      jjCheckNAddTwoStates(8, 9);
                   break;
                case 9:
-                  if (curChar == 34 && kind > 69)
-                     kind = 69;
+                  if (curChar == 34 && kind > 63)
+                     kind = 63;
                   break;
                case 10:
                   if (curChar == 39)
@@ -1319,21 +1280,21 @@
                      jjCheckNAddStates(10, 12);
                   break;
                case 15:
-                  if (curChar == 39 && kind > 70)
-                     kind = 70;
+                  if (curChar == 39 && kind > 64)
+                     kind = 64;
                   break;
                case 16:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 66)
-                     kind = 66;
+                  if (kind > 60)
+                     kind = 60;
                   jjCheckNAddStates(0, 6);
                   break;
                case 17:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 66)
-                     kind = 66;
+                  if (kind > 60)
+                     kind = 60;
                   jjCheckNAdd(17);
                   break;
                case 18:
@@ -1347,8 +1308,8 @@
                case 20:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 61)
+                     kind = 61;
                   jjCheckNAddTwoStates(20, 21);
                   break;
                case 22:
@@ -1358,8 +1319,8 @@
                case 23:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 61)
+                     kind = 61;
                   jjCheckNAdd(23);
                   break;
                case 24:
@@ -1373,15 +1334,15 @@
                case 27:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 61)
+                     kind = 61;
                   jjCheckNAdd(27);
                   break;
                case 28:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 61)
+                     kind = 61;
                   jjCheckNAddTwoStates(28, 29);
                   break;
                case 30:
@@ -1391,8 +1352,8 @@
                case 31:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 61)
+                     kind = 61;
                   jjCheckNAdd(31);
                   break;
                default : break;
@@ -1410,8 +1371,8 @@
                case 1:
                   if ((0x47fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 65)
-                     kind = 65;
+                  if (kind > 59)
+                     kind = 59;
                   jjCheckNAdd(1);
                   break;
                case 4:
@@ -1487,15 +1448,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", "\56", "\50", "\51", "\75", "\76", 
-"\74", null, null, "\41\75", "\52", null, null, null, null, null, null, null, null, 
-null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
-null, null, null, null, "\73", };
+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 = {
-   0xffffffffffffffe1L, 0xefL, 
+   0xbfffffffffffffe1L, 0x3L, 
 };
 static final long[] jjtoSkip = {
    0x1eL, 0x0L, 



Mime
View raw message