sboag       2002/11/12 21:27:36

  Modified:    java/grammar Tag: xslt20 javacc.xsl jjtree.xsl
                        xpath-grammar.xml
               java/src/org/apache/xml/dtm/ref Tag: xslt20
                        DTMManagerDefault.java
               java/src/org/apache/xpath Tag: xslt20 XPath.java
               java/src/org/apache/xpath/parser Tag: xslt20
                        NonExecutableExpression.java RootOfRoot.java
                        SimpleNode.java XPath.java XPathConstants.java
                        XPathTokenManager.java XPathTreeConstants.java
  Removed:     java/src Tag: xslt20 xml-commons-src.tar.gz
  Log:
  Integrated new grammar from Nov. 15th draft, with a small tweak to allow 
multiple
  comparison expressions (to allow success of xpath1 parsing).
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1.2.1 +177 -16   xml-xalan/java/grammar/Attic/javacc.xsl
  
  Index: javacc.xsl
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/grammar/Attic/javacc.xsl,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.1.2.1
  diff -u -r1.1.2.1 -r1.1.2.1.2.1
  --- javacc.xsl        14 Aug 2002 18:47:41 -0000      1.1.2.1
  +++ javacc.xsl        13 Nov 2002 05:27:33 -0000      1.1.2.1.2.1
  @@ -19,11 +19,42 @@
        
    <!-- ==============  CHANGE LOG: ==============
     $Log$
  -  Revision 1.1.2.1  2002/08/14 18:47:41  pauldick
  -  Xalan3 specific additions.
  -
  -  Revision 1.1  2002/07/14 05:47:11  sboag
  -  new grammar definition set for XPath2.
  +  Revision 1.1.2.1.2.1  2002/11/13 05:27:33  sboag
  +  Integrated new grammar from Nov. 15th draft, with a small tweak to allow 
multiple
  +  comparison expressions (to allow success of xpath1 parsing).
  +
  +  Revision 1.14  2002/11/06 07:42:25  sboag
  +  1) I did some work on BNF production numbering.  At least it is consecutive
  +  now in regards to the defined tokens.
  +
  +  2) (XQuery only) I added URL Literal to the main list of literals, and 
added a
  +  short note that it is defined equivalently to string literal.  URL Literal 
has to
  +  exist right now for relatively esoteric purposes for transitioning the 
lexical
  +  state (to DEFAULT rather than OPERATOR as StringLiteral does).  It is
  +  used in DefaultCollationDecl, NamespaceDecl, SubNamespaceDecl, and
  +  DefaultNamespaceDecl.  To be clear, URL Literal was already in the August
  +  draft, I just added it to the list of literals in the main doc.
  +
  +  Revision 1.13  2002/10/22 16:51:08  sboag
  +  New Grammar Issues List.  New productions:
  +  OrderBy, ComputedTextConstructor, PositionVar, Castable, As (TypeDecl).
  +  Removed:
  +  unordered, SortExpr
  +  Fixed reserved word bugs with:
  +  empty, stable
  +  Other minor "fixes":
  +  Change precedence of UnaryExpr to be looser binding than UnionExpr
  +  Change RangeExpr to only allow one "to".
  +
  +  Revision 1.12  2002/07/28 19:54:13  sboag
  +  Fixed problems with import, '*', '?', and ',', reported by Jonathan and 
Dana.
  +
  +  Revision 1.11  2002/07/18 01:17:39  sboag
  +  Fixed some bugs.
  +
  +  Revision 1.10  2002/07/15 07:25:47  sboag
  +  Bug fixes, added match patterns, and responses to
  +  Don's email 
http://lists.w3.org/Archives/Member/w3c-xml-query-wg/2002Jul/0156.html.
   
     Revision 1.9  2002/06/28 09:02:07  sboag
     Merged Don's latest work with new grammar proposal.  Changes too numerous
  @@ -165,28 +196,136 @@
   // jwr: why doesn't this use java.util.Stack() instead of java.util.Vector()?
   
   TOKEN_MGR_DECLS : {
  -  private java.util.Vector stateStack = new java.util.Vector();
  -  private void pushState() {
  +  private Stack stateStack = new Stack();
  +  static final int PARENMARKER = 2000;
  +  
  +  /**
  +   * Push the current state onto the state stack.
  +   */
  +  private void pushState()
  +  {
       stateStack.addElement(new Integer(curLexState));
     }
  -  private void pushState(int state) {
  -    stateStack.addElement(new Integer(state));
  +  
  +  /**
  +   * Push the given state onto the state stack.
  +   * @param state Must be a valid state.
  +   */
  +  private void pushState(int state)
  +  {
  +    stateStack.push(new Integer(state));
     }
  -  private void popState() {
  -    if(stateStack.size() == 0)
  +  
  +  /**
  +   * Pop the state on the state stack, and switch to that state.
  +   */
  +  private void popState()
  +  {
  +    if (stateStack.size() == 0)
       {
         printLinePos();
       }
   
  -    int nextState = ((Integer)stateStack.lastElement()).intValue();
  -
  -    stateStack.setSize(stateStack.size() - 1);
  +    int nextState = ((Integer) stateStack.pop()).intValue();
  +    if(nextState == PARENMARKER)
  +      printLinePos();
       SwitchTo(nextState);
     }
   
  +  /**
  +   * Push a parenthesis state.  This pushes, in addition to the 
  +   * lexical state value, a special marker that lets 
  +   * resetParenStateOrSwitch(int state)
  +   * know if it should pop and switch.  Used for the comma operator.
  +   */
  +  private void pushParenState(int commaState, int rparState)
  +  {
  +    stateStack.push(new Integer(rparState));
  +    stateStack.push(new Integer(commaState));
  +    stateStack.push(new Integer(PARENMARKER));
  +    SwitchTo(commaState);
  +  }
  +
  +
  +//  /**
  +//   * Push a parenthesis state.  This pushes, in addition to the 
  +//   * lexical state value, a special marker that lets 
  +//   * resetParenStateOrSwitch(int state)
  +//   * know if it should pop and switch.  Used for the comma operator.
  +//   */
  +//  private void pushParenState()
  +//  {
  +//    stateStack.push(new Integer(curLexState));
  +//    stateStack.push(new Integer(PARENMARKER));
  +//  }
  +
  +  /**
  +   * If a PARENMARKER is on the stack, switch the state to 
  +   * the state underneath the marker.  Leave the stack in 
  +   * the same state.  If the stack is zero, do nothing.
  +   * @param state The state to switch to if the PARENMARKER is not found.
  +   */
  +  private void resetParenStateOrSwitch(int state)
  +  {
  +    if (stateStack.size() == 0)
  +    {
  +      SwitchTo(state);
  +      return;
  +    }
  +
  +    int nextState = ((Integer) stateStack.peek()).intValue();
  +    if (PARENMARKER == nextState)
  +    {
  +      // Wait for right paren to do the pop!
  +      Integer intObj = (Integer) stateStack.elementAt(stateStack.size() - 2);
  +      nextState = intObj.intValue();
  +      SwitchTo(nextState);
  +    }
  +    else
  +      SwitchTo(state);
  +  }
  +  
  +//   /**
  +//    * Pop the lexical state stack two elements.
  +//    */
  +// private void popParenState()
  +//   {
  +//     if (stateStack.size() == 0)
  +//       return;
  +// 
  +//     int nextState = ((Integer) stateStack.peek()).intValue();
  +//     if (PARENMARKER == nextState)
  +//     {
  +//       stateStack.pop();
  +//       stateStack.pop();
  +//     }
  +//   }
  +
  +  /**
  +   * Pop the lexical state stack two elements.
  +   */
  +  private void popParenState()
  +  {
  +    if (stateStack.size() == 0)
  +      return;
  +
  +    int nextState = ((Integer) stateStack.peek()).intValue();
  +    if (PARENMARKER == nextState)
  +    {
  +      stateStack.pop();
  +      stateStack.pop();
  +      int rparState = ((Integer) stateStack.peek()).intValue();
  +      SwitchTo(rparState);
  +      stateStack.pop();
  +    }
  +  }
  +
  +  /**
  +   * Print the current line position.
  +   */
     public void printLinePos()
     {
  -    System.err.println("Line: "+input_stream.getEndLine());
  +    System.err.println("Line: " + input_stream.getEndLine());
     }
   }
   
  @@ -208,6 +347,12 @@
                 or contains(concat(@refs, ' '), concat(' ',current()/@name, ' 
'))]"/>
       <xsl:variable name="defaultLexState" 
         select="$lexStateTransitions/g:transition-default[not(@if) or 
contains(@if,$spec)][not($lexState)]"/>
  +
  +    <xsl:if test="$defaultLexState">
  +      <xsl:message>
  +        <xsl:text>Default transition: </xsl:text><xsl:value-of 
select="@name"/>
  +      </xsl:message>
  +    </xsl:if>
       
       <xsl:variable name="recognizeLexState" select="$lexState/@recognize | 
$defaultLexState/@recognize"/>
       
  @@ -235,7 +380,7 @@
       <xsl:value-of select="@name"/> : <xsl:call-template name="space"/>
       <xsl:text> &gt;</xsl:text>
       <xsl:choose>
  -      <xsl:when test="contains($lexState/@action, 'pushState(')">
  +      <xsl:when test="contains($lexState/@action, '(')">
           <xsl:text> { </xsl:text>
           <xsl:value-of select="$lexState/@action"/>
           <xsl:text>; }</xsl:text>
  @@ -531,7 +676,16 @@
         <xsl:text>)</xsl:text>
         -->
         
  -      <xsl:text>)*</xsl:text>
  +      <xsl:text>)</xsl:text>
  +      <xsl:choose>
  +        <xsl:when test="g:binary[not(@if) or 
contains(@if,$spec)]/@prefix-seq-type">
  +          <xsl:value-of select="g:binary/@prefix-seq-type"/>
  +        </xsl:when>
  +        <xsl:otherwise>
  +          <xsl:text>*</xsl:text>
  +        </xsl:otherwise>
  +      </xsl:choose>
  +
       </xsl:when>
       <xsl:when test="g:postfix">
         <xsl:if test="following-sibling::g:level">
  @@ -542,7 +696,15 @@
           <xsl:with-param name="choices"
                           select="g:postfix[not(@if) or contains(@if,$spec)]"/>
         </xsl:call-template>
  -      <xsl:text>*</xsl:text>
  +      <xsl:choose>
  +        <xsl:when test="g:postfix/@prefix-seq-type">
  +          <xsl:value-of select="g:postfix/@prefix-seq-type"/>
  +        </xsl:when>
  +        <xsl:otherwise>
  +          <xsl:text>*</xsl:text>
  +        </xsl:otherwise>
  +      </xsl:choose>
  +      
       </xsl:when>
       <xsl:when test="g:prefix">
         <xsl:choose>
  
  
  
  1.1.2.1.2.1 +11 -3     xml-xalan/java/grammar/Attic/jjtree.xsl
  
  Index: jjtree.xsl
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/grammar/Attic/jjtree.xsl,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.1.2.1
  diff -u -r1.1.2.1 -r1.1.2.1.2.1
  --- jjtree.xsl        14 Aug 2002 18:47:41 -0000      1.1.2.1
  +++ jjtree.xsl        13 Nov 2002 05:27:33 -0000      1.1.2.1.2.1
  @@ -54,13 +54,20 @@
     <xsl:template name="extra-parser-code"/>
        
        <xsl:template name="parser">
  -             PARSER_BEGIN(XPath)
  +    <xsl:variable name="parser-class">
  +      <xsl:choose>
  +                     <xsl:when test="$spec='xpath'">XPath</xsl:when>
  +                     <xsl:when test="$spec='pathx1'">XPath</xsl:when>
  +      <xsl:otherwise>XPath</xsl:otherwise>
  +    </xsl:choose>
  +    </xsl:variable>
  +    PARSER_BEGIN(<xsl:value-of select="$parser-class"/>)
   
   <xsl:call-template name="set-parser-package"/>
                
   import java.util.Stack;
   
  -public class XPath {
  +public class <xsl:value-of select="$parser-class"/> {
         <xsl:call-template name="extra-parser-code"/>
   
         boolean m_isMatchPattern = false;
  @@ -163,7 +170,8 @@
                  }
                }
   
  -             PARSER_END(XPath)
  +    PARSER_END(<xsl:value-of select="$parser-class"/>)
  +
        </xsl:template>
        
        <xsl:template name="action-production">
  
  
  
  1.1.2.1.2.1 +602 -423  xml-xalan/java/grammar/Attic/xpath-grammar.xml
  
  Index: xpath-grammar.xml
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/grammar/Attic/xpath-grammar.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.1.2.1
  diff -u -r1.1.2.1 -r1.1.2.1.2.1
  --- xpath-grammar.xml 14 Aug 2002 18:47:40 -0000      1.1.2.1
  +++ xpath-grammar.xml 13 Nov 2002 05:27:33 -0000      1.1.2.1.2.1
  @@ -25,7 +25,8 @@
       display-name="XML Processing Formal Semantics Core Language 1.0"/>
     <language id="match" display-name="XSLT 2.0 Match Patterns"/>
        
  -  <start name="Expr" state="DEFAULT" if="xpath pathx1"/>
  +  <start name="Expr" state="DEFAULT" if="pathx1"/>
  +  <start name="XPath" state="DEFAULT" if="xpath"/>
     <start name="QueryList" state="DEFAULT" if="core"/>
     <start name="QueryList" state="DEFAULT" if="xquery"/>
     <start name="Pattern" state="DEFAULT" if="match"/>
  @@ -37,8 +38,145 @@
     <token name="XmlCommentEnd" if="xquery core">
       <string>--></string>
     </token>
  +
  +  <token name="IntegerLiteral" inline="false" value-type="number" 
type="literal">
  +    <ref name="Digits"/>
  +  </token>
  +     
  +  <token name="DecimalLiteral" inline="false" value-type="number" 
type="literal">
  +    <choice>
  +      <sequence>
  +        <string>.</string>
  +        <ref name="Digits"/>
  +      </sequence>
  +      <sequence>
  +        <ref name="Digits"/>
  +        <string>.</string>
  +                             <zeroOrMore>
  +                                     <charClass>
  +                                             <charRange minChar="0" 
maxChar="9"/>
  +                                     </charClass>
  +                             </zeroOrMore>
  +      </sequence>
  +    </choice>
  +  </token>
        
  -  <token name="ExprComment" if="xquery core xpath" special="yes">
  +  <token name="DoubleLiteral" inline="false" value-type="number" 
type="literal">
  +    <choice>
  +      <sequence>
  +        <string>.</string>
  +        <ref name="Digits"/>
  +      </sequence>
  +      <sequence>
  +        <ref name="Digits"/>
  +        <optional>
  +          <string>.</string>
  +          <zeroOrMore>
  +            <charClass>
  +              <charRange minChar="0" maxChar="9"/>
  +            </charClass>
  +          </zeroOrMore>
  +        </optional>
  +      </sequence>
  +    </choice>
  +    <charClass>
  +                     <char>e</char>
  +                     <char>E</char>
  +    </charClass>
  +    <optional>
  +                     <charClass>
  +                             <char>+</char>
  +                             <char>-</char>
  +                     </charClass>
  +    </optional>
  +    <ref name="Digits"/>
  +  </token>
  +
  +  <token name="StringLiteral" inline="false" value-type="string" 
type="literal" whitespace-spec="significant">
  +    <choice>
  +                     <sequence>
  +        <string>&quot;</string>
  +        <zeroOrMore>
  +          <choice>
  +            <sequence>
  +              <char>&quot;</char>
  +              <char>&quot;</char>
  +            </sequence>
  +                                     <complement>
  +                                             <charClass>
  +                                                     <char>&quot;</char>
  +                                             </charClass>
  +                                     </complement>
  +                 </choice>
  +         </zeroOrMore>
  +             <string>&quot;</string>
  +     </sequence>
  +             <sequence>
  +                     <string>&apos;</string>
  +                     <zeroOrMore>
  +                             <choice>
  +                                     <sequence>
  +                                             <char>&apos;</char>
  +                                             <char>&apos;</char>
  +                                     </sequence>
  +                             <complement>
  +                                     <charClass>
  +                                             <char>&apos;</char>
  +                                     </charClass>
  +                             </complement>
  +                     </choice>
  +                     </zeroOrMore>
  +                     <string>&apos;</string>
  +             </sequence>
  +     </choice>
  +  </token>
  +
  +  <token name="AtStringLiteral" if="xquery core">
  +    <string>at</string>
  +    <optionalSkip/>
  +    <ref name="StringLiteral"/>
  +  </token>
  +     
  +  <token name="URLLiteral" inline="false" value-type="string" if="xquery 
core" type="literal" whitespace-spec="significant">
  +             <choice>
  +      <sequence>
  +        <string>&quot;</string>
  +        <zeroOrMore>
  +          <choice>
  +            <sequence>
  +              <char>&quot;</char>
  +              <char>&quot;</char>
  +            </sequence>
  +                                       <complement>
  +                                         <charClass>
  +                                         <char>&quot;</char>
  +                                   </charClass>
  +                                       </complement>
  +                   </choice>
  +           </zeroOrMore>
  +                 <string>&quot;</string>
  +      </sequence>
  +               <sequence>
  +                       <string>&apos;</string>
  +                       <zeroOrMore>
  +                               <choice>
  +                                       <sequence>
  +                                               <char>&apos;</char>
  +                                               <char>&apos;</char>
  +                                       </sequence>
  +                                 <complement>
  +                                         <charClass>
  +                                                 <char>&apos;</char>
  +                                         </charClass>
  +                                 </complement>
  +                         </choice>
  +                       </zeroOrMore>
  +                       <string>&apos;</string>
  +               </sequence>
  +       </choice>
  +  </token>
  +     
  +  <token name="ExprComment" if="xquery core xpath" special="yes" 
inline="false">
       <string>{--</string>
                <zeroOrMore>
                        <complement>
  @@ -50,13 +188,16 @@
       <string>--}</string>
     </token>
        
  -  <skip recognize="DEFAULT OPERATOR QNAME NAMESPACEDECL XMLSPACE_DECL 
ITEMTYPE FUNCDEF NAMESPACEKEYWORD" if="xquery core xpath">
  +  <skip recognize="DEFAULT OPERATOR QNAME NAMESPACEDECL XMLSPACE_DECL 
ITEMTYPE NAMESPACEKEYWORD VARNAME" if="xquery core xpath">
                <oneOrMore>
  -      <ref name="WhitespaceChar"/>
  +      <choice>
  +        <ref name="WhitespaceChar"/>
  +        <ref name="ExprComment"/>
  +      </choice>
                </oneOrMore>
     </skip>
        
  -  <skip recognize="DEFAULT OPERATOR" if="pathx1">
  +  <skip recognize="DEFAULT OPERATOR QNAME" if="pathx1">
                <oneOrMore>
                        <ref name="WhitespaceChar"/>
                </oneOrMore>
  @@ -209,6 +350,10 @@
     <token name="In" if="xpath xquery core">
       <string >in</string>
     </token>
  +
  +  <token name="InContext" if="xpath xquery core">
  +    <string >context</string>
  +  </token>
        
     <token name="Satisfies" value-type="id">
       <string >satisfies</string>
  @@ -218,7 +363,7 @@
       <string >return</string>
     </token>
        
  -  <token name="Then">
  +   <token name="Then">
       <string >then</string>
     </token>
        
  @@ -232,7 +377,7 @@
   
     <token name="DeclareXMLSpace" if="xquery core">
       <string >declare</string>
  -    <optionalSkip/>
  +    <requiredSkip show="no"/>
       <string>xmlspace</string>
     </token>
   
  @@ -250,9 +395,15 @@
        
     <token name="DeclareNamespace" if="xquery core">
       <string >declare</string>
  -    <optionalSkip/>
  +    <requiredSkip show="no"/>
       <string>namespace</string>
     </token>
  +
  +  <token name="DeclareResult" if="xquery core">
  +    <string >declare</string>
  +    <requiredSkip show="no"/>
  +    <string>result</string>
  +  </token>
        
     <token name="To">
       <string >to</string>
  @@ -261,6 +412,10 @@
     <token name="Where" if="xquery core">
       <string >where</string>
     </token>
  +
  +  <token name="Collation" if="xquery core">
  +    <string >collation</string>
  +  </token>
        
     <token name="Intersect">
       <string >intersect</string>
  @@ -282,17 +437,13 @@
        <string >after</string>
     </token -->
        
  -  <token name="Precedes">
  -    <string >precedes</string>
  -  </token>
  -  
  -  <token name="Follows">
  -    <string >follows</string>
  -  </token>
  -     
     <token name="As" if="xquery core">
       <string >as</string>
     </token>
  +
  +  <token name="AtWord" if="xquery core">
  +    <string >at</string>
  +  </token>
        
     <token name="Case" if="xquery core">
       <string >case</string>
  @@ -303,6 +454,11 @@
       <requiredSkip show="no"/>
       <string >of</string>
     </token>
  +
  +  <token name="Castable">
  +    <string>castable</string>
  +    <requiredSkip show="no"/>
  +    <string >as</string>  </token>
        
     <!-- see 
http://lists.w3.org/Archives/Member/w3c-xsl-query/2002Mar/0154.html -->
     <!-- token name="Only" value-type="id">
  @@ -313,10 +469,10 @@
        <string >returns</string>
     </token -->
        
  -  <token name="RparReturns" if="xquery core">
  +  <token name="RparAs" if="xquery core">
       <string >)</string>
       <optionalSkip/>
  -    <string >returns</string>
  +    <string >as</string>
     </token>
        
     <!-- token name="Function" value-type="id" if="xquery core">
  @@ -338,12 +494,12 @@
     <!-- token name="Element" value-type="id">
        <string >element</string>
     </token -->
  -     
  +
     <token name="ElementQNameLbrace" value-type="id">
       <string >element</string>
       <requiredSkip show="no"/>
       <ref name="QName"/>
  -    <requiredSkip show="no"/>
  +    <optionalSkip/>
       <string>{</string>
     </token>
        
  @@ -351,25 +507,39 @@
       <string >attribute</string>
       <requiredSkip show="no"/>
       <ref name="QName"/>
  -    <requiredSkip show="no"/>
  +    <optionalSkip/>
       <string>{</string>
     </token>
        
     <token name="ElementLbrace" value-type="id">
       <string >element</string>
  -    <requiredSkip show="no"/>
  +    <optionalSkip/>
       <string>{</string>
     </token>
        
     <token name="AttributeLbrace" value-type="id">
       <string >attribute</string>
  -    <requiredSkip show="no"/>
  +    <optionalSkip/>
  +    <string>{</string>
  +  </token>
  +
  +  <token name="TextLbrace" value-type="id" if="xquery core">
  +    <string >text</string>
  +    <optionalSkip/>
       <string>{</string>
     </token>
        
     <!-- token name="Attribute" value-type="id">
        <string >attribute</string>
     </token -->
  +
  +  <token name="DefaultCollationEquals" if="xpath xquery core">
  +    <string >default</string>
  +    <requiredSkip show="no"/>
  +    <string >collation</string>
  +    <requiredSkip show="no"/>
  +    <string >=</string>
  +  </token>
        
     <token name="DefaultElement" if="xpath xquery core">
       <string >default</string>
  @@ -395,10 +565,16 @@
       <string >value</string>
     </token>
   
  -  <token name="Type" if="xpath xquery core" value-type="id">
  +  <token name="Type" if="core" value-type="id">
       <string >type</string>
     </token>
   
  +  <token name="TypeQName" if="xpath xquery core">
  +    <string >type</string>
  +    <requiredSkip show="no"/>
  +    <ref name="QName"/>
  +  </token>
  +
     <token name="Node" if="xquery core xpath" value-type="id">
       <string >node</string>
     </token>
  @@ -426,7 +602,7 @@
   
     <token name="ImportSchemaToken" if="xquery core">
       <string >import</string>
  -    <optionalSkip/>
  +    <requiredSkip show="no"/>
       <string>schema</string>
     </token>
   
  @@ -613,28 +789,28 @@
        
     <token name="Some" value-type="id">
       <string >some</string>
  -    <optionalSkip if="xpath"/>
  -    <ref name="VariableIndicator" if="xpath"/>
  +    <optionalSkip/>
  +    <ref name="VariableIndicator"/>
     </token>
        
     <token name="Every" value-type="id">
       <string >every</string>
  -       <optionalSkip if="xpath"/>
  -    <ref name="VariableIndicator" if="xpath"/>
  +       <optionalSkip/>
  +    <ref name="VariableIndicator"/>
     </token>
        
     <!-- Added for XPath with no reserved words. -sb -->
     <token name="ForVariable" override="true" 
                 if="xpath pathx1 xquery core" node-type="void">
       <string >for</string>
  -    <optionalSkip if="xpath"/>
  -    <ref name="VariableIndicator" if="xpath"/>
  +    <optionalSkip/>
  +    <ref name="VariableIndicator"/>
     </token>
        
     <token name="LetVariable" if="xquery core">
       <string >let</string>
  -    <optionalSkip if="xpath"/>
  -    <ref name="VariableIndicator" if="xpath"/>
  +    <optionalSkip/>
  +    <ref name="VariableIndicator"/>
     </token>
        
     <token name="CastAs">
  @@ -655,8 +831,16 @@
       <string >as</string>
     </token>
        
  -  <token name="Validate" if="xpath xquery core">
  +  <token name="ValidateLbrace" if="xpath xquery core">
  +    <string >validate</string>
  +    <optionalSkip/>
  +    <string>{</string>
  +  </token>
  +
  +  <token name="ValidateContext" if="xpath xquery core">
       <string >validate</string>
  +    <requiredSkip show="no"/>
  +    <string>context</string>
     </token>
        
     <token name="Digits" inline="false">
  @@ -666,60 +850,7 @@
         </charClass>
       </oneOrMore>
     </token>
  -     
  -  <token name="IntegerLiteral" inline="false" value-type="number">
  -    <ref name="Digits"/>
  -  </token>
  -     
  -  <token name="DecimalLiteral" inline="false" value-type="number">
  -    <choice>
  -      <sequence>
  -        <string>.</string>
  -        <ref name="Digits"/>
  -      </sequence>
  -      <sequence>
  -        <ref name="Digits"/>
  -        <string>.</string>
  -                             <zeroOrMore>
  -                                     <charClass>
  -                                             <charRange minChar="0" 
maxChar="9"/>
  -                                     </charClass>
  -                             </zeroOrMore>
  -      </sequence>
  -    </choice>
  -  </token>
  -     
  -  <token name="DoubleLiteral" inline="false" value-type="number">
  -    <choice>
  -      <sequence>
  -        <string>.</string>
  -        <ref name="Digits"/>
  -      </sequence>
  -      <sequence>
  -        <ref name="Digits"/>
  -        <optional>
  -          <string>.</string>
  -          <zeroOrMore>
  -            <charClass>
  -              <charRange minChar="0" maxChar="9"/>
  -            </charClass>
  -          </zeroOrMore>
  -        </optional>
  -      </sequence>
  -    </choice>
  -    <charClass>
  -                     <char>e</char>
  -                     <char>E</char>
  -    </charClass>
  -    <optional>
  -                     <charClass>
  -                             <char>+</char>
  -                             <char>-</char>
  -                     </charClass>
  -    </optional>
  -    <ref name="Digits"/>
  -  </token>
  -     
  +             
     <token name="Comment" override="true" if="xquery core xpath" 
value-type="id">
       <string >comment</string>
     </token>
  @@ -734,8 +865,6 @@
       <string>{</string>
     </token>
        
  -     
  -     
     <token name="Text" override="true" if="xquery core xpath" value-type="id">
       <string >text</string >
     </token>
  @@ -744,9 +873,9 @@
       <string>untyped</string>
     </token>
   
  -  <token name="Unordered" if="xquery core" value-type="id">
  +  <!-- token name="Unordered" if="xquery core" value-type="id">
       <string>unordered</string>
  -  </token>
  +  </token -->
        
        
     <token name="ProcessingInstruction" override="true" if="xquery core xpath" 
value-type="id">
  @@ -804,109 +933,25 @@
     <!-- token name="Colon" if="xquery core">
        <string>:</string>
     </token -->
  -     
  -  <!-- Should only be recognized in attribute content. -->
  -  <token name="EscapeQuot" inline="false" override="true" if="xquery">
  -    <sequence>
  -      <char>&quot;</char>
  -      <char>&quot;</char>
  -    </sequence>
  -  </token>
  -     
  -  <!-- OpenQuot and CloseQuote need to be before StringLiteral in 
  -     order for them to be matched by flex. -->
  -  <token name="OpenQuot" if="xquery core">
  -    <string>&quot;</string>
  -  </token>
  -     
  -  <token name="CloseQuot" if="xquery core">
  -    <string>&quot;</string>
  -  </token>
  -     
  -  <token name="StringLiteral" inline="false" value-type="string">
  -    <choice>
  -                     <sequence>
  -        <string>&quot;</string>
  -        <zeroOrMore>
  -          <choice>
  -            <sequence>
  -              <char>&quot;</char>
  -              <char>&quot;</char>
  -            </sequence>
  -                                     <complement>
  -                                             <charClass>
  -                                                     <char>&quot;</char>
  -                                             </charClass>
  -                                     </complement>
  -                 </choice>
  -         </zeroOrMore>
  -             <string>&quot;</string>
  -     </sequence>
  -             <sequence>
  -                     <string>&apos;</string>
  -                     <zeroOrMore>
  -                             <choice>
  -                                     <sequence>
  -                                             <char>&apos;</char>
  -                                             <char>&apos;</char>
  -                                     </sequence>
  -                             <complement>
  -                                     <charClass>
  -                                             <char>&apos;</char>
  -                                     </charClass>
  -                             </complement>
  -                     </choice>
  -                     </zeroOrMore>
  -                     <string>&apos;</string>
  -             </sequence>
  -     </choice>
  +     
  +  <!-- Should only be recognized in attribute content. -->
  +  <token name="EscapeQuot" inline="false" override="true" if="xquery">
  +    <sequence>
  +      <char>&quot;</char>
  +      <char>&quot;</char>
  +    </sequence>
     </token>
        
  -  <token name="AtStringLiteral" if="xquery core">
  -    <string>at</string>
  -    <optionalSkip/>
  -    <ref name="StringLiteral"/>
  +  <!-- OpenQuot and CloseQuote need to be before StringLiteral in 
  +     order for them to be matched by flex. -->
  +  <token name="OpenQuot" if="xquery core">
  +    <string>&quot;</string>
     </token>
        
  -  <token name="NamespaceURLLiteral" inline="false" value-type="string">
  -             <choice>
  -      <sequence>
  -        <string>&quot;</string>
  -        <zeroOrMore>
  -          <choice>
  -            <sequence>
  -              <char>&quot;</char>
  -              <char>&quot;</char>
  -            </sequence>
  -                                       <complement>
  -                                         <charClass>
  -                                         <char>&quot;</char>
  -                                   </charClass>
  -                                       </complement>
  -                   </choice>
  -           </zeroOrMore>
  -                 <string>&quot;</string>
  -      </sequence>
  -               <sequence>
  -                       <string>&apos;</string>
  -                       <zeroOrMore>
  -                               <choice>
  -                                       <sequence>
  -                                               <char>&apos;</char>
  -                                               <char>&apos;</char>
  -                                       </sequence>
  -                                 <complement>
  -                                         <charClass>
  -                                                 <char>&apos;</char>
  -                                         </charClass>
  -                                 </complement>
  -                         </choice>
  -                       </zeroOrMore>
  -                       <string>&apos;</string>
  -               </sequence>
  -       </choice>
  +  <token name="CloseQuot" if="xquery core">
  +    <string>&quot;</string>
     </token>
  -
  +     
     <token name="Dot" value-type="id">
       <string>.</string>
     </token>
  @@ -915,16 +960,26 @@
       <string>..</string>
     </token>
        
  -  <token name="SortbyLpar" if="xquery core">
  +  <!-- token name="SortbyLpar" if="xquery core">
       <string >sort</string>
  -    <optionalSkip/>
  +    <requiredSkip show="no"/>
       <string >by</string>
       <optionalSkip/>
       <string>(</string>
  +  </token -->
  +
  +  <token name="OrderBy" if="xquery core">
  +    <string >order</string>
  +    <requiredSkip show="no"/>
  +    <string >by</string>
     </token>
  -     
  -  <token name="Stable" if="xquery core">
  +
  +  <token name="OrderByStable" if="xquery core">
       <string >stable</string>
  +    <requiredSkip show="no"/>
  +    <string >order</string>
  +    <requiredSkip show="no"/>
  +    <string >by</string>
     </token>
        
     <token name="Ascending" if="xquery core" value-type="id">
  @@ -957,18 +1012,18 @@
       <ref name="NCName"/>
     </token>
        
  -  <token name="NCName" inline="false" value-type="string">
  +  <token name="NCName" inline="false" value-type="string" is-xml="yes">
       <ref name="Nmstart"/>
       <zeroOrMore>
         <ref name="Nmchar"/>
       </zeroOrMore>
     </token>
        
  -  <token name="Prefix" value-type="string" visible="false">
  +  <token name="Prefix" value-type="string" visible="false" is-xml="yes">
       <ref name="NCName"/>
     </token>
        
  -  <token name="LocalPart" value-type="string" visible="false">
  +  <token name="LocalPart" value-type="string" visible="false" is-xml="yes">
       <ref name="NCName"/>
     </token>
        
  @@ -985,26 +1040,14 @@
        <ref name="VarName"/>
     </token -->
   
  -  <token name="QName" inline="false" value-type="string">
  -    <optional>
  -      <ref name="Prefix"/>
  -      <string>:</string>
  -    </optional>
  -       <ref name="LocalPart"/>
  -  </token>
  -     
  -  <token name="FuncName" inline="false" value-type="string">
  +  <token name="QName" inline="false" value-type="string" is-xml="yes">
       <optional>
         <ref name="Prefix"/>
         <string>:</string>
       </optional>
          <ref name="LocalPart"/>
     </token>
  -     
  -  <token name="FuncPListOpen">
  -    <string>(</string>
  -  </token>
  -     
  +                     
     <token name="QNameLpar" value-type="string">
                <ref name="QName"/>
                <optionalSkip/>
  @@ -1029,138 +1072,148 @@
                        <ref name="Nmchar"/>
                </zeroOrMore>
     </token>
  -     
  -  <lexical-state-transitions if="pathx1">
                
  -             <transition-default recognize="DEFAULT OPERATOR" 
nextState="OPERATOR"/>
  -             <transition refs="WhitespaceChar Nmstart Nmchar Digits NCName 
  -                     Letter BaseChar Ideographic CombiningChar 
  -                     Digit Extender"/>
  -             <transition refs="S" recognize="DEFAULT OPERATOR QNAME 
START_TAG NAMESPACEDECL ITEMTYPE FUNCDEF 
  -                                    NAMESPACEKEYWORD START_TAG END_TAG"/>
  -             <transition refs="Star" recognize="DEFAULT" 
nextState="OPERATOR"/>
  -             <transition refs="At QNameLpar IDLpar KeyLpar NodeLpar 
  -                     CommentLpar TextLpar 
  -                     ProcessingInstructionLpar" 
  -                     recognize="DEFAULT" nextState="DEFAULT"/>
  -             <transition refs="Plus Minus" recognize="OPERATOR DEFAULT" 
  -                     nextState="DEFAULT"/>
  -             <transition refs="Div Mod And Or Multiply Vbar 
  -                     Equals NotEquals LtEquals GtEquals 
  -                     Lt Gt" recognize="OPERATOR" 
  -                     nextState="DEFAULT"/>
  -             <transition refs="Root RootDescendants" recognize="DEFAULT" 
  -                     nextState="DEFAULT"/>
  -             <transition refs="Slash SlashSlash Comma" recognize="OPERATOR" 
  -                     nextState="DEFAULT"/>
  -             <transition refs="Lpar Lbrack" 
  -                     recognize="DEFAULT OPERATOR" nextState="DEFAULT"/>
  -  </lexical-state-transitions>
  -     
  -  <state-list if="xquery core xpath">
  +  <state-list if="xquery core xpath pathx1">
       <state name="#ANY">This state is for patterns that can be recognized in 
any state.</state>
       <state name="DEFAULT">This state is for patterns that occur at the 
beginning of an expression.</state>
       <state name="OPERATOR">This state is for patterns that are defined for 
operators.</state>
       <state name="QNAME">When a qualified name is expected, and it is 
required to remove ambiguity from patterns that look like keywords, this state 
is used.</state>
  -    <state name="NAMESPACEDECL">This state occurs inside of a namespace 
declaration, and is needed to recognize a NCName that is to be used as the 
prefix, as opposed to allowing a QName to occur.  (Otherwise, the difference 
between NCName and QName are ambiguous.)</state>
  -    <state name="NAMESPACEKEYWORD">This state occurs at places where the 
keyword "namespace" is expected, which would otherwise be ambiguous compared to 
a QName.  QNames can not occur in this state.</state>
  -    <state name="XMLSPACE_DECL">This state occurs at places where the 
keywords "preserve" and "strip" is expected to support "declare xmlspace".  
QNames can not occur in this state.</state>
  +    <state name="NAMESPACEDECL" if="xquery core">This state occurs inside of 
a namespace declaration, and is needed to recognize a NCName that is to be used 
as the prefix, as opposed to allowing a QName to occur.  (Otherwise, the 
difference between NCName and QName are ambiguous.)</state>
  +    <state name="NAMESPACEKEYWORD" if="xquery core">This state occurs at 
places where the keyword "namespace" is expected, which would otherwise be 
ambiguous compared to a QName.  QNames can not occur in this state.</state>
  +    <state name="XMLSPACE_DECL" if="xquery core">This state occurs at places 
where the keywords "preserve" and "strip" is expected to support "declare 
xmlspace".  QNames can not occur in this state.</state>
       <state name="ITEMTYPE">This state distinguishes tokens that can occur 
only inside the ItemType production.</state>
  -    <state name="FUNCDEF">This state is defined to recognise a FuncName, 
which then transitions to an ITEMTYPE state after the opening left bracket, in 
order to recognize SequenceType productions.</state>
  +    <!-- state name="FUNCDEF" if="xquery core">This state is defined to 
recognise a FuncName, which then transitions to an ITEMTYPE state after the 
opening left bracket, in order to recognize SequenceType productions.</state -->
       <state name="VARNAME">This state differentiates variable names from 
qualified names.  This allows only the pattern of a QName to be recognized when 
otherwise ambiguities could occur.</state>
  -    <state name="START_TAG">This state allows attributes in the native XML 
syntax, and marks the beginning of an element construction. Element 
constructors also push the current state, popping it at the conclusion of an 
end tag. In the START_TAG state, the string ">" is recognized as a token which 
is associated with the transition to the original state.</state>
  -    <state name="ELEMENT_CONTENT">This state allows XML-like content, 
without these characters being misinterpreted as expressions. The character "{" 
marks a transition to the DEFAULT state, i.e. the start of an embedded 
expression, and the "}" character pops back to the ELEMENT_CONTENT state.  To 
allow curly braces to be used as character content, a double left or right 
curly brace is interpreted as a single curly brace character.  The string 
"&lt;/" is interpreted as the beginning of an end tag, which is associated with 
a transition to the END_TAG state.</state>
  -    <state name="END_TAG">When the end tag is terminated, the state is 
popped to the state that was pushed at the start of the corresponding start 
tag.</state>
  -    <state name="XML_COMMENT">The "&lt;--" token marks the beginning of an 
XML Comment, and the "-->" token marks the end.  This allows no special 
interpretation of other characters in this state.</state>
  -    <state name="PROCESSING_INSTRUCTION">In this state, only lexemes that 
are legal in a processing instruction are recognized.</state>
  -    <state name="CDATA_SECTION">In this state, only lexemes that are legal 
in a CDATA section are recognized.</state>
  -    <state name="QUOT_ATTRIBUTE_CONTENT">This state allows content legal for 
attributes. The character "{" marks a transition to the DEFAULT state, i.e. the 
start of an embedded expression, and the "}" character pops back to the 
original state.  To allow curly braces to be used as character content, a 
double left or right curly brace is interpreted as a single curly brace 
character.  This state is the same as QUOT_ATTRIBUTE_CONTENT, except that 
apostrophes are allowed without escaping, and an unescaped quote marks the end 
of the state.</state>
  -    <state name="APOS_ATTRIBUTE_CONTENT">This state is the same as 
QUOT_ATTRIBUTE_CONTENT, except that quotes are allowed, and an unescaped 
apostrophe marks the end of the state.</state>
  +    <state name="START_TAG" if="xquery core">This state allows attributes in 
the native XML syntax, and marks the beginning of an element construction. 
Element constructors also push the current state, popping it at the conclusion 
of an end tag. In the START_TAG state, the string ">" is recognized as a token 
which is associated with the transition to the original state.</state>
  +    <state name="ELEMENT_CONTENT" if="xquery core">This state allows 
XML-like content, without these characters being misinterpreted as expressions. 
The character "{" marks a transition to the DEFAULT state, i.e. the start of an 
embedded expression, and the "}" character pops back to the ELEMENT_CONTENT 
state.  To allow curly braces to be used as character content, a double left or 
right curly brace is interpreted as a single curly brace character.  The string 
"&lt;/" is interpreted as the beginning of an end tag, which is associated with 
a transition to the END_TAG state.</state>
  +    <state name="END_TAG" if="xquery core">When the end tag is terminated, 
the state is popped to the state that was pushed at the start of the 
corresponding start tag.</state>
  +    <state name="XML_COMMENT" if="xquery core">The "&lt;--" token marks the 
beginning of an XML Comment, and the "-->" token marks the end.  This allows no 
special interpretation of other characters in this state.</state>
  +    <state name="PROCESSING_INSTRUCTION" if="xquery core">In this state, 
only lexemes that are legal in a processing instruction name are 
recognized.</state>
  +    <state name="PROCESSING_INSTRUCTION_CONTENT" if="xquery core">In this 
state, only characters are that are legal in processing instruction content are 
recognized.</state>
  +    <state name="CDATA_SECTION" if="xquery core">In this state, only lexemes 
that are legal in a CDATA section are recognized.</state>
  +    <state name="QUOT_ATTRIBUTE_CONTENT" if="xquery core">This state allows 
content legal for attributes. The character "{" marks a transition to the 
DEFAULT state, i.e. the start of an embedded expression, and the "}" character 
pops back to the original state.  To allow curly braces to be used as character 
content, a double left or right curly brace is interpreted as a single curly 
brace character.  This state is the same as QUOT_ATTRIBUTE_CONTENT, except that 
apostrophes are allowed without escaping, and an unescaped quote marks the end 
of the state.</state>
  +    <state name="APOS_ATTRIBUTE_CONTENT" if="xquery core">This state is the 
same as QUOT_ATTRIBUTE_CONTENT, except that quotes are allowed, and an 
unescaped apostrophe marks the end of the state.</state>
     </state-list>
   
  -  <lexical-state-transitions if="xquery core xpath">
  +  <lexical-state-transitions if="xquery core xpath pathx1">
                <transition refs="WhitespaceChar Nmstart NCName  Nmchar Prefix 
LocalPart 
                        Digits Letter BaseChar Ideographic CombiningChar 
                        Digit  Extender HexDigits"/>
  -             <transition refs="S" recognize="DEFAULT OPERATOR QNAME 
START_TAG NAMESPACEDECL ITEMTYPE FUNCDEF 
  +
  +    <transition-default recognize="DEFAULT OPERATOR" nextState="OPERATOR"/>
  +    <transition refs="Rbrack IntegerLiteral DecimalLiteral DoubleLiteral 
TypeswitchLpar OrderByStable" recognize="DEFAULT OPERATOR" 
nextState="OPERATOR"/>
  +
  +             <transition refs="S" recognize="DEFAULT OPERATOR QNAME 
START_TAG NAMESPACEDECL ITEMTYPE 
                                       NAMESPACEKEYWORD END_TAG"/>
          <!-- ==== NEXT=>DEFAULT ==== -->
  -       <transition refs="NamespaceURLLiteral" recognize="NAMESPACEDECL" 
nextState="DEFAULT"/>
  +       <transition refs="URLLiteral" recognize="NAMESPACEDECL" 
nextState="DEFAULT"/>
          <transition refs="Slash SlashSlash Div Idiv Mod And Or 
  -             Multiply In Return Then Else To 
  +             Multiply Return Then Else To 
                Union Intersect Except 
                Equals Is NotEquals 
                IsNot LtEquals GtEquals 
                Lt Gt Vbar
  -             Precedes Follows LtLt GtGt 
  +             LtLt GtGt 
                FortranEq FortranNe FortranGt
                FortranGe FortranLt FortranLe 
  -             Type
  -             Where SortbyLpar Satisfies As QMark ColonEquals" 
  +             Type In InContext
  +             Where OrderBy Satisfies AtWord ColonEquals" 
                recognize="OPERATOR" nextState="DEFAULT"/>
  -    <transition refs="Comma" recognize="OPERATOR DEFAULT" 
nextState="DEFAULT"/>
  +
  +    <transition refs="TypeQName" recognize="DEFAULT" nextState="OPERATOR"/>
  +
  +    <transition refs="Collation" recognize="OPERATOR" nextState="OPERATOR"/>
  +
  +    <transition refs="QMark" 
  +             recognize="DEFAULT OPERATOR" nextState="DEFAULT"/>
  +
  +    <!-- nextState="DEFAULT" -->
  +    <transition refs="Comma" recognize="OPERATOR DEFAULT QNAME" 
  +       action="resetParenStateOrSwitch(DEFAULT)"/>
   
       <transition refs="AttributeType ElementType Node Document Comment Text 
  -             ProcessingInstruction Item Untyped AtomicValue" 
  +             ProcessingInstruction Item Untyped AtomicValue AtomicType 
Empty" 
                recognize="ITEMTYPE" nextState="DEFAULT"/>
   
       <transition refs="Lbrack Plus Minus" 
                recognize="DEFAULT OPERATOR" nextState="DEFAULT"/>
   
       <transition refs="Lpar" 
  -             recognize="DEFAULT OPERATOR QNAME" nextState="DEFAULT"/>
  +               recognize="DEFAULT OPERATOR QNAME"  nextState="DEFAULT"/>
       <transition refs="TextLpar CommentLpar NodeLpar 
ProcessingInstructionLpar" 
  -             recognize="QNAME DEFAULT" nextState="DEFAULT"/>
  +             recognize="QNAME DEFAULT"  nextState="DEFAULT"/>
  +    <transition refs="DefaultCollationEquals" recognize="DEFAULT OPERATOR" 
  +         nextState="NAMESPACEDECL"/>
       <!-- Not sure that this is right for SemiColon, but SemiColon is a 
            strange character anyhow.  -sb -->
       <transition refs="SemiColon" 
                recognize="QNAME DEFAULT OPERATOR" nextState="DEFAULT"/>
       <!-- transition refs="Returns" recognize="OPERATOR" nextState="DEFAULT"/ 
-->
  -    <transition refs="Type Empty Stable QNameLpar IfLpar" 
recognize="DEFAULT" nextState="DEFAULT"/>
  +    <transition refs="Type" 
  +       recognize="DEFAULT" nextState="DEFAULT"/>
  +
  +    <transition refs="IfLpar" 
  +       recognize="DEFAULT" nextState="DEFAULT"/>
  +
  +    <transition refs="QNameLpar" 
  +       recognize="DEFAULT" nextState="DEFAULT"/>
  +
       <transition refs="AtStringLiteral" 
                recognize="DEFAULT OPERATOR" nextState="DEFAULT"/>
       <transition refs="Item Node Document Comment Text"
                recognize="OPERATOR" nextState="DEFAULT"/>
  -    <transition refs="LbraceExprEnclosure" recognize="DEFAULT OPERATOR" 
  +    <transition refs="LbraceExprEnclosure ValidateLbrace" recognize="DEFAULT 
OPERATOR ITEMTYPE" 
                nextState="DEFAULT" action="pushState(DEFAULT)"/>
  -    <transition refs="AttributeQNameLbrace ElementQNameLbrace ElementLbrace 
AttributeLbrace" recognize="DEFAULT" 
  +    <transition refs="AttributeQNameLbrace ElementQNameLbrace ElementLbrace 
DocumentLbrace AttributeLbrace TextLbrace" recognize="DEFAULT" 
                nextState="DEFAULT" action="pushState(DEFAULT)"/>
  +    <transition refs="ValidateContext" 
  +                recognize="DEFAULT" nextState="DEFAULT"/>
  +
       <transition refs="Lbrace" recognize="START_TAG END_TAG ELEMENT_CONTENT 
                QUOT_ATTRIBUTE_CONTENT 
                APOS_ATTRIBUTE_CONTENT" 
                nextState="DEFAULT" action="pushState"/>
       <!-- ==== NEXT=>OPERATOR ==== -->
  -    <transition-default recognize="DEFAULT OPERATOR" nextState="OPERATOR"/>
       <transition refs="VarName" recognize="VARNAME" nextState="OPERATOR"/>
       <transition refs="Star" recognize="DEFAULT QNAME" nextState="OPERATOR"/>
       <transition refs="QName NCNameColonStar StarColonNCName Dot DotDot" 
  -             recognize="ITEMTYPE QNAME DEFAULT OPERATOR" 
nextState="OPERATOR"/>
  -    <transition refs="Rpar" recognize="DEFAULT OPERATOR ITEMTYPE QNAME" 
nextState="OPERATOR"/>
  +                            recognize="ITEMTYPE QNAME DEFAULT OPERATOR"  
  +                   nextState="OPERATOR"/>
  +
  +    <transition refs="Rpar" recognize="DEFAULT OPERATOR ITEMTYPE QNAME" 
  +       nextState="OPERATOR"/>
  +
       <transition refs="Ascending Descending EmptyGreatest EmptyLeast" 
                recognize="OPERATOR" nextState="OPERATOR"/>
       <transition refs="StringLiteral" recognize="DEFAULT OPERATOR 
NAMESPACEKEYWORD" nextState="OPERATOR"/>
       <transition refs="Default" recognize="OPERATOR" nextState="OPERATOR"/>
       <!-- ==== NEXT=>VARNAME ==== -->
       <transition refs="VariableIndicator" recognize="DEFAULT OPERATOR 
ITEMTYPE QNAME" nextState="VARNAME"/>
  -    <transition refs="Unordered" recognize="DEFAULT OPERATOR" if="xquery 
core"/>
  +    <!-- transition refs="Unordered" recognize="DEFAULT OPERATOR" if="xquery 
core"/ -->
  +    <!-- transition refs="ForVariable LetVariable Some Every" 
  +               recognize="DEFAULT OPERATOR" nextState="ITEMTYPE" if="xquery 
core"/ -->
       <transition refs="ForVariable LetVariable Some Every" 
  -               recognize="DEFAULT OPERATOR" nextState="ITEMTYPE" if="xquery 
core"/>
  -    <transition refs="ForVariable LetVariable Some Every" 
  -               recognize="DEFAULT OPERATOR" nextState="VARNAME" if="xpath"/>
  +               recognize="DEFAULT OPERATOR" nextState="VARNAME"/>
       <!-- ==== NEXT=>NAMESPACEKEYWORD ==== -->
  -    <transition refs="DefaultElement DefaultFunction ImportSchemaToken" 
recognize="DEFAULT" nextState="NAMESPACEKEYWORD"/>
  +    <transition refs="DefaultElement DefaultFunction ImportSchemaToken" 
recognize="DEFAULT OPERATOR" nextState="NAMESPACEKEYWORD"/>
       <!-- ==== NEXT=>NAMESPACEDECL ==== -->
       <transition refs="Namespace" recognize="NAMESPACEKEYWORD" 
nextState="NAMESPACEDECL"/>
       <transition refs="DeclareNamespace" recognize="DEFAULT OPERATOR" 
nextState="NAMESPACEDECL"/>
       <transition refs="AssignEquals NCNameForPrefix" 
recognize="NAMESPACEDECL" nextState="NAMESPACEDECL"/>
       <!-- ==== NEXT=>ITEMTYPE ==== -->
  -    <transition refs="Instanceof Case" recognize="OPERATOR" 
nextState="ITEMTYPE"/>
  +    <transition refs="Instanceof Castable Case As" recognize="OPERATOR" 
nextState="ITEMTYPE"/>
       <transition refs="CastAs TreatAs" recognize="DEFAULT" 
nextState="ITEMTYPE"/>
  -    <transition refs="FuncName" recognize="FUNCDEF"/>
  -    <transition refs="FuncPListOpen" recognize="FUNCDEF" 
nextState="ITEMTYPE"/>
  -    <transition refs="RparReturns" recognize="DEFAULT OPERATOR" 
nextState="ITEMTYPE"/>
  +    <transition refs="DeclareResult" recognize="DEFAULT OPERATOR" 
nextState="ITEMTYPE"/>
  +    <!-- transition refs="FuncName" recognize="FUNCDEF"/ -->
  +    <!-- transition refs="FuncPListOpen" recognize="FUNCDEF" 
  +                           action="pushParenState(DEFAULT, ITEMTYPE)"/ -->
  +    
  +    <!-- Both nextState and action here on purpose -->
  +    <transition refs="RparAs" recognize="DEFAULT OPERATOR ITEMTYPE QNAME" 
  +       nextState="ITEMTYPE"/>
  +
       <!-- ==== NEXT=>FUNCDEF ==== -->
  -    <transition refs="DefineFunction" recognize="DEFAULT OPERATOR" 
nextState="FUNCDEF"/>
  +    <transition refs="DefineFunction" recognize="DEFAULT OPERATOR" 
nextState="DEFAULT"/>
       <!-- ==== NEXT=>QNAME ==== -->
       <transition refs="OfType" recognize="DEFAULT OPERATOR" 
nextState="QNAME"/>
       <transition refs="Root RootDescendants 
  @@ -1178,10 +1231,10 @@
       <transition refs="ProcessingInstructionStart" 
                recognize="DEFAULT ELEMENT_CONTENT" 
nextState="PROCESSING_INSTRUCTION" action="pushState"/>
       <!-- ==== NEXT=>CDATA_SECTION ==== -->
  -    <transition refs="CdataSectionStart" recognize="ELEMENT_CONTENT" 
nextState="CDATA_SECTION"/>
  +    <transition refs="CdataSectionStart" recognize="ELEMENT_CONTENT DEFAULT" 
nextState="CDATA_SECTION" action="pushState"/>
       <!-- ==== NEXT=>ELEMENT_CONTENT ==== -->
       <transition refs="CdataSectionEnd" 
  -             recognize="ELEMENT_CONTENT CDATA_SECTION" 
nextState="ELEMENT_CONTENT"/>
  +             recognize="ELEMENT_CONTENT CDATA_SECTION" action="popState"/>
       <transition refs="StartTagClose" recognize="START_TAG" 
                nextState="ELEMENT_CONTENT"/>
       <!-- ==== NEXT=>START_TAG ==== -->
  @@ -1213,8 +1266,9 @@
         recognize="XMLSPACE_DECL" 
                        nextState="DEFAULT"/>
       <!-- ==== NEXT=>(SAME) ==== -->
  -    <transition refs="ExprComment" recognize="DEFAULT ELEMENT_CONTENT"/>
  -    <transition refs="PITarget" recognize="PROCESSING_INSTRUCTION"/>
  +    <transition refs="ExprComment" recognize="DEFAULT OPERATOR QNAME 
NAMESPACEDECL XMLSPACE_DECL 
  +                                              ITEMTYPE NAMESPACEKEYWORD 
VARNAME ELEMENT_CONTENT"/>
  +    <transition refs="PITarget" recognize="PROCESSING_INSTRUCTION" 
nextState="PROCESSING_INSTRUCTION_CONTENT"/>
       <transition refs="PredefinedEntityRef CharRef" 
                recognize="ELEMENT_CONTENT QUOT_ATTRIBUTE_CONTENT 
APOS_ATTRIBUTE_CONTENT"/>
       <transition refs="TagQName" recognize="START_TAG END_TAG"/>
  @@ -1224,18 +1278,18 @@
       <transition refs="Char" recognize="ELEMENT_CONTENT CDATA_SECTION 
                QUOT_ATTRIBUTE_CONTENT 
                APOS_ATTRIBUTE_CONTENT 
  -             PROCESSING_INSTRUCTION XML_COMMENT 
  +             PROCESSING_INSTRUCTION_CONTENT XML_COMMENT 
                XQUERY_COMMENT"/>
       <!-- ==== NEXT=>pop ==== -->
   
       <transition refs="XmlCommentEnd" recognize="XML_COMMENT" 
                action="popState"/>
       <transition refs="ProcessingInstructionEnd" 
  -             recognize="PROCESSING_INSTRUCTION" action="popState"/>
  +             recognize="PROCESSING_INSTRUCTION_CONTENT" action="popState"/>
       <transition refs="EmptyTagClose" recognize="START_TAG" 
                action="popState"/>
       <transition refs="EndTagClose" recognize="END_TAG" action="popState"/>
  -    <transition refs="Rbrace" recognize="OPERATOR DEFAULT" 
action="popState"/>
  +    <transition refs="Rbrace" recognize="QUOT_ATTRIBUTE_CONTENT OPERATOR 
DEFAULT" action="popState"/>
   
     </lexical-state-transitions>
     <!-- ====================== End Lexical States ==================== -sb -->
  @@ -1255,9 +1309,7 @@
     <!-- ### Use the name="" names instead of Expr_1() for generated .jj code 
-->
     <production name="Query" if="xquery core">
       <ref name="QueryProlog"/>
  -    <optional>
  -               <ref name="ExprSequence"/>
  -    </optional>
  +    <ref name="QueryBody"/>
     </production>
   
     <production name="QueryProlog" if="xquery core">
  @@ -1266,6 +1318,7 @@
           <ref name="NamespaceDecl"/>
                                <ref name="XMLSpaceDecl"/>
           <ref name="DefaultNamespaceDecl"/>
  +        <ref name="DefaultCollationDecl"/>
           <ref name="SchemaImport"/>
         </choice>
       </zeroOrMore>
  @@ -1274,6 +1327,19 @@
       </zeroOrMore>
     </production>
   
  +  <production name="XPath" if="xpath">
  +    <optional>
  +      <ref name="ExprSequence"/>
  +    </optional>
  +  </production>
  +
  +  <production name="QueryBody" if="xquery core">
  +    <optional>
  +      <ref name="ExprSequence"/>
  +    </optional>
  +  </production>
  +
  +
     <production name="ExprSequence">
       <ref name="Expr"/>
       <zeroOrMore name="CommaExpr">
  @@ -1282,7 +1348,7 @@
       </zeroOrMore>
     </production>
   
  -  <production name="Pattern" if="xpath">
  +  <production name="Pattern" if="xpath pathx1" sub-spec="xslt-patterns">
                <ref name="PathPattern"/>
                <optional>
                        <choice>
  @@ -1293,7 +1359,7 @@
          </optional>
     </production>
   
  -  <production name="PathPattern" if="xpath">
  +  <production name="PathPattern" if="xpath pathx1" sub-spec="xslt-patterns">
                <choice break="true">
                        <sequence>
                                <ref name="Root"/>
  @@ -1319,7 +1385,8 @@
                </choice>               
     </production>
   
  -  <production name="RelativePathPattern" if="xpath" node-type="void">
  +  <production name="RelativePathPattern" if="xpath pathx1" node-type="void"
  +             sub-spec="xslt-patterns">
                <ref name="PatternStep"/>
                <optional>
                        <choice>
  @@ -1330,7 +1397,8 @@
                </optional>
     </production>
   
  -  <production name="PatternStep" if="xpath">
  +  <production name="PatternStep" if="xpath pathx1"
  +             sub-spec="xslt-patterns">
                <optional>
                        <ref name="PatternAxis"/>
                </optional>
  @@ -1338,7 +1406,8 @@
                <ref name="Predicates"/>
     </production>
   
  -  <production name="PatternAxis" if="xpath" node-type="void">
  +  <production name="PatternAxis" if="xpath pathx1" node-type="void"
  +             sub-spec="xslt-patterns">
       <choice break="true">
         <ref name="AxisChild"/>
         <ref name="AxisAttribute"/>
  @@ -1346,7 +1415,8 @@
       </choice>
     </production>
   
  -  <production name="IdKeyPattern" if="xpath">
  +  <production name="IdKeyPattern" if="xpath pathx1"
  +             sub-spec="xslt-patterns">
                <ref name="QNameLpar"/>
                <ref name="IdKeyValue"/>
                <optional>
  @@ -1357,7 +1427,8 @@
     </production>
   
   
  -  <production name="IdKeyPattern" if="match">
  +  <production name="IdKeyPattern" if="match"
  +             sub-spec="xslt-patterns">
                <choice>
                        <sequence>
                                <ref name="IDLpar"/>
  @@ -1367,15 +1438,17 @@
                        <sequence>
                                <ref name="KeyLpar"/>
                                <ref name="StringLiteral"/>
  +        <ref name="Comma"/>
                                <ref name="IdKeyValue"/>
                                <ref name="Rpar"/>
                        </sequence>
                </choice>
     </production>
   
  -  <production name="IdKeyValue" if="xpath" node-type="void">
  +  <production name="IdKeyValue" if="xpath pathx1" node-type="void"
  +             sub-spec="xslt-patterns">
                <choice>
  -                     <ref name="Literal"/>
  +                     <ref name="StringLiteral"/>
                        <sequence>
                                <ref name="VariableIndicator"/>
                                <ref name="VarName"/>
  @@ -1384,18 +1457,6 @@
     </production>
   
     <exprProduction name="Expr" node-type="void">
  -             <level>  
  -                     <postfix name="SortExpr" if="xquery core">
  -                             <sequence>
  -                                     <optional>
  -                                             <ref name="Stable"/>
  -                                     </optional>
  -                                     <ref name="SortbyLpar"/>
  -                                     <ref name="SortSpecList"/>
  -                                     <ref name="Rpar"/>
  -                             </sequence>
  -                     </postfix>
  -             </level>
                <level> 
                        <binary name="OrExpr" if="xpath xquery pathx1">
                                <ref name="Or"/>
  @@ -1406,15 +1467,15 @@
                                <ref name="And"/>
                        </binary>
                </level>
  -    <level>
  +    <!-- level if="xquery core">
         <prefix name="UnorderedExpr" if="xquery core" prefix-seq-type="?">
                                <choice>
                                        <ref name="Unordered" if="xquery core"/>
                                </choice>
         </prefix>
  -    </level>
  +    </level -->
                <level>
  -                     <prefix name="FLWRExpr" if="xquery core">
  +                     <prefix name="FLWRExpr" if="xquery core" 
prefix-seq-type="*">
                                <sequence>
                                        <oneOrMore if="xquery">
                                                <choice>
  @@ -1429,13 +1490,16 @@
                                        <optional if="xquery">
                                                <ref name="WhereClause"/>
                                        </optional>
  +                                     <optional if="xquery core">
  +                                             <ref name="OrderByClause" 
if="xquery core"/>
  +                                     </optional>
                                        <ref name="Return"/>
                                </sequence>
                        </prefix>
                        
                        <prefix name="ForExpr" if="xpath">
                                <sequence>
  -                                     <ref name="ForClause"/>
  +                                     <ref name="SimpleForClause"/>
                                        <ref name="Return"/>
                                </sequence>
                        </prefix>
  @@ -1447,16 +1511,21 @@
                                                <ref name="Some"/>
                                                <ref name="Every"/>
                                        </choice>
  -                                     <ref name="Binding" if="xquery core"/>
  +                                     <!-- ref name="VariableIndicator" 
if="xquery core"/ -->
                                        <ref name="VarName"/>
  +          <optional if="xquery core">
  +                                       <ref name="TypeDeclaration" 
if="xquery core"/>
  +          </optional>
                                        <ref name="In"/>
                                        <ref name="Expr"/>
                                        <zeroOrMore>
                                                <ref name="Comma"/>
                                                <sequence>
  -                                                     <ref 
name="VariableIndicator" if="xpath"/>
  -                                                     <ref name="Binding" 
if="xquery"/>
  +                                                     <ref 
name="VariableIndicator"/>
                                                        <ref name="VarName"/>
  +              <optional if="xquery core">
  +                                           <ref name="TypeDeclaration" 
if="xquery core"/>
  +              </optional>
                                                </sequence>
                                                <ref name="In"/>
                                                <ref name="Expr"/>
  @@ -1489,6 +1558,7 @@
                                        <ref name="IfLpar"/>
                                        <ref name="Expr"/>
                                        <ref name="Rpar"/>
  +          <!-- XPath TF decision to remove, Oct 16, 2002 -->
                                        <ref name="Then"/>
                                        <ref name="Expr"/>
                                        <ref name="Else"/>
  @@ -1496,15 +1566,23 @@
                        </prefix>  
                </level>
                <level>
  -      <postfix name="InstanceofExpr" if="xquery xpath">
  -                             <sequence>
  -                                     <ref name="Instanceof"/>
  -                                     <ref name="SequenceType"/>
  -                             </sequence>
  +      <postfix name="InstanceofExpr" if="xquery xpath" prefix-seq-type="?">
  +                               <sequence>
  +                                       <ref name="Instanceof"/>
  +                                       <ref name="SequenceType"/>
  +                               </sequence>
  +      </postfix>       
  +    </level>
  +             <level>
  +      <postfix name="CastableExpr" if="xquery xpath" prefix-seq-type="?">
  +          <sequence>
  +            <ref name="Castable"/>
  +            <ref name="SingleType"/>
  +          </sequence>
         </postfix>       
       </level>
       <level>
  -      <binary name="ComparisonExpr">
  +      <binary name="ComparisonExpr" prefix-seq-type="*" if="xpath xquery 
core">
           <choice break="true">
             <ref name="ValueComp"/>
             <ref name="GeneralComp"/>
  @@ -1512,9 +1590,12 @@
             <ref name="OrderComp"/>
           </choice>
         </binary>
  +      <binary name="ComparisonExpr" if="pathx1">
  +        <ref name="GeneralComp"/>
  +      </binary>
       </level>
       <level>
  -      <binary name="RangeExpr" if="xquery xpath">
  +      <binary name="RangeExpr" if="xquery xpath" prefix-seq-type="?">
           <ref name="To"/>
         </binary>
       </level>
  @@ -1536,6 +1617,14 @@
           </choice>
         </binary>
       </level>
  +    <level node-type="UnaryExpr">
  +      <prefix name="UnaryExpr" if="xquery xpath pathx1">
  +        <choice>
  +          <ref name="Minus"/>
  +          <ref name="Plus" if="xquery xpath core"/>
  +        </choice>
  +      </prefix>
  +    </level>
       <level>
         <binary name="UnionExpr" if="xquery xpath pathx1">
           <choice>
  @@ -1552,19 +1641,12 @@
           </choice>
         </binary>
       </level>
  -    <level node-type="UnaryExpr">
  -      <prefix name="UnaryExpr" if="xquery xpath pathx1">
  -        <choice>
  -          <ref name="Minus"/>
  -          <ref name="Plus" if="xquery xpath core"/>
  -        </choice>
  -      </prefix>
  -    </level>
       <level>
                        <primary name="ValueExpr">
                                <choice>
  -                                     <ref name="ValidateExpr"/>
  -                                     <ref name="CastExpr"/>
  +                                     <ref name="ValidateExpr" if="xquery 
core xpath"/>
  +                                     <ref name="CastExpr" if="xquery core 
xpath"/>
  +                                     <ref name="TreatExpr" if="xquery core 
xpath"/>
                                        <ref name="Constructor" if="xquery 
core"/>
                                        <ref name="PathExpr"/>
                          </choice>
  @@ -1584,7 +1666,17 @@
                                <ref name="RootDescendants"/>
                                <ref name="RelativePathExpr"/>
                        </sequence>
  -                     <ref name="RelativePathExpr"/>
  +                     <sequence if="pathx1">
  +        <ref name="RHSPrimaryExpr" if="pathx1"/>
  +        <optional if="pathx1">
  +                         <choice if="pathx1">
  +                           <ref name="Slash" if="pathx1"/>
  +                     <ref name="SlashSlash" if="pathx1"/>
  +             </choice>
  +          <ref name="RelativePathExpr" if="pathx1"/>
  +        </optional>
  +                     </sequence>
  +                     <ref name="RelativePathExpr" if="xquery xpath core"/>
                </choice>
        </production>
        
  @@ -1603,23 +1695,51 @@
                <choice>
                        <ref name="ForwardStep"/>
                        <ref name="ReverseStep"/>
  -                     <ref name="PrimaryExpr"/>       
  +                     <ref name="PrimaryExpr" if="xpath xquery core"/>        
                </choice>
                <ref name="Predicates"/>
        </production>
        
     <!-- ForClause is slightly different now for XQuery vs. XPath.  -sb -->
  -  <production name="ForClause" if="xquery xpath core">
  +  <production name="ForClause" if="xquery core">
  +    <ref name="ForVariable"/>
  +             <!-- ref name="VariableIndicator" if="xquery core"/ -->
  +    <ref name="VarName"/>
  +    <optional if="xquery core">
  +                     <ref name="TypeDeclaration" if="xquery core"/>
  +    </optional>
  +    <optional if="xquery core">
  +      <ref name="PositionalVar" if="xquery core"/>
  +    </optional>
  +    <ref name="In"/>
  +    <ref name="Expr"/>
  +    <zeroOrMore if="xquery">
  +               <ref name="Comma"/>
  +      <sequence>
  +                             <ref name="VariableIndicator"/>
  +        <ref name="VarName"/>
  +        <optional if="xquery core">
  +                                     <ref name="TypeDeclaration" if="xquery 
core"/>
  +        </optional>
  +        <optional if="xquery core">
  +          <ref name="PositionalVar" if="xquery core"/>
  +        </optional>
  +      </sequence>
  +      <ref name="In"/>
  +      <ref name="Expr"/>
  +    </zeroOrMore>
  +  </production>
  +
  +  <!-- SimpleForClause is slightly different now for XQuery vs. XPath.  -sb 
-->
  +  <production name="SimpleForClause" if="xpath">
       <ref name="ForVariable"/>
  -             <ref name="Binding" if="xquery core"/>
       <ref name="VarName"/>
       <ref name="In"/>
       <ref name="Expr"/>
  -    <zeroOrMore if="xpath xquery">
  +    <zeroOrMore>
                  <ref name="Comma"/>
         <sequence>
  -                 <ref name="VariableIndicator" if="xpath"/>
  -                             <ref name="Binding" if="xquery core"/>
  +                             <ref name="VariableIndicator"/>
           <ref name="VarName"/>
         </sequence>
         <ref name="In"/>
  @@ -1629,16 +1749,21 @@
   
     <production name="LetClause" if="xquery core">
       <ref name="LetVariable"/>
  -             <ref name="Binding" if="xquery core"/>
  +             <!-- ref name="VariableIndicator" if="xquery core"/ -->
       <ref name="VarName"/>
  +    <optional if="xquery core">
  +               <ref name="TypeDeclaration" if="xquery core"/>
  +    </optional>
       <ref name="ColonEquals"/>
       <ref name="Expr"/>
       <zeroOrMore if="xquery">
                  <ref name="Comma"/>
         <sequence>
  -                             <ref name="VariableIndicator" if="xpath"/>
  -                             <ref name="Binding" if="xquery core"/>
  +                             <ref name="VariableIndicator"/>
                                <ref name="VarName"/>
  +        <optional if="xquery core">
  +                                     <ref name="TypeDeclaration" if="xquery 
core"/>
  +        </optional>
                        </sequence>
         <ref name="ColonEquals"/>
         <ref name="Expr"/>
  @@ -1650,27 +1775,54 @@
       <ref name="Expr"/>
     </production>
   
  +  <production name="PositionalVar" if="core xquery">
  +    <ref name="AtWord"/>
  +             <ref name="VariableIndicator"/>
  +             <ref name="VarName"/>    
  +  </production>
  +
        <production name="ValidateExpr" if="xpath core xquery">
  -             <!-- I think "validate" will be a problem for XPath -->
  -             <ref name="Validate"/>
  -             <optional>
  -                     <ref name="SchemaContext"/>
  -             </optional>
  -             <ref name="Lbrace"/>
  +    <choice>
  +      <ref name="ValidateLbrace"/>
  +      <sequence>
  +        <ref name="ValidateContext"/>
  +        <ref name="SchemaGlobalContext"/>
  +        <zeroOrMore>
  +          <ref name="Slash"/>
  +          <ref name="SchemaContextStep"/>
  +        </zeroOrMore>
  +        <ref name="LbraceExprEnclosure"/>
  +      </sequence>
  +    </choice>
                <ref name="Expr"/>
                <ref name="Rbrace"/>
        </production>
        
        <production name="CastExpr" if="xpath core xquery">
  -             <choice if="xquery xpath core">
  -                     <ref name="CastAs"/>
  -                     <ref name="TreatAs" if="xpath xquery"/>
  -                     <!-- ref name="AssertAs"/ -->
  -             </choice>
  -             <ref name="SequenceType"/>
  -             <ref name="ParenthesizedExpr"/>
  +           <sequence>
  +               <ref name="CastAs"/>
  +               <ref name="SingleType"/>
  +             </sequence>
  +             <ref name="ParenthesizedExpr"/>
  +
  +    <!-- ref name="Lpar"/>
  +    <ref name="Expr"/>
  +    <optional>
  +      <ref name="Comma"/>
  +      <ref name="Expr"/>
  +    </optional>
  +    <ref name="Rpar"/ -->
  +
        </production>
        
  +     <production name="TreatExpr" if="xpath core xquery">
  +             <sequence>
  +                     <ref name="TreatAs" if="xpath xquery"/>
  +                     <ref name="SequenceType"/>
  +             </sequence>
  +             <ref name="ParenthesizedExpr"/>    
  +     </production>
  +
        <production name="Constructor" if="xquery core">
                <choice break="true">
                        <ref name="ElementConstructor" if="xquery"/>
  @@ -1680,6 +1832,7 @@
                        <ref name="ComputedDocumentConstructor" if="xquery 
core"/>
                        <ref name="ComputedElementConstructor" if="xquery 
core"/>
                        <ref name="ComputedAttributeConstructor" if="xquery 
core"/>
  +                     <ref name="ComputedTextConstructor" if="xquery core"/>
                </choice>
        </production>
        
  @@ -1716,21 +1869,31 @@
                <choice break="false">
                        <ref name="LtLt"/>
                        <ref name="GtGt"/>
  -                     <ref name="Precedes"/>
  -                     <ref name="Follows"/>
                </choice>
        </production>
  +
  +     <production name="OrderByClause" if="xquery core">
  +             <choice break="false">
  +                     <ref name="OrderBy"/>
  +                     <ref name="OrderByStable"/>
  +             </choice>
  +    <ref name="OrderSpecList"/>
  +     </production>
        
  -  <production name="SortSpecList" if="xquery core">
  -    <ref name="Expr"/>
  -    <ref name="SortModifier"/>
  -    <optional>
  +  <production name="OrderSpecList" if="xquery core">
  +    <ref name="OrderSpec"/>
  +    <zeroOrMore>
         <ref name="Comma"/>
  -      <ref name="SortSpecList"/>
  -    </optional>
  +      <ref name="OrderSpec"/>
  +    </zeroOrMore>
  +  </production>
  +
  +  <production name="OrderSpec" if="xquery core">
  +    <ref name="Expr"/>
  +    <ref name="OrderModifier"/>
     </production>
        
  -  <production name="SortModifier" if="xquery core">
  +  <production name="OrderModifier" if="xquery core">
       <optional>
         <choice>
           <ref name="Ascending"/>
  @@ -1743,15 +1906,20 @@
          <ref name="EmptyLeast"/>
         </choice>
       </optional>
  +    <optional>
  +      <ref name="Collation"/>
  +      <ref name="StringLiteral"/>
  +    </optional>
     </production>
   
     <production name="CaseClause" if="xquery core">
       <ref name="Case"/>
  -    <ref name="SequenceType"/>
                <optional>
                        <ref name="VariableIndicator"/>
                        <ref name="VarName"/>
  +      <ref name="As"/>
                </optional>
  +    <ref name="SequenceType"/>
       <ref name="Return"/>
       <ref name="Expr"/>
     </production>
  @@ -1963,6 +2131,7 @@
       <optional if="xquery core xpath">
         <ref name="ExprSequence"/>
       </optional>
  +    <ref name="Expr" if="pathx1"/>
       <ref name="Rpar"/>
     </production>
   
  @@ -1983,15 +2152,15 @@
     </production>
   
     <production name="Param" if="xquery core">
  -             <optional>
  -                     <ref name="SequenceType"/>
  -             </optional>
                <ref name="VariableIndicator"/>
                <ref name="VarName"/>
  +             <optional>
  +                     <ref name="TypeDeclaration"/>
  +             </optional>
     </production>
   
     <production name="SchemaContext" if="xpath xquery core">
  -    <ref name="In"/>
  +    <ref name="InContext"/>
       <ref name="SchemaGlobalContext"/>
       <zeroOrMore>
         <ref name="Slash"/>
  @@ -2002,10 +2171,7 @@
     <production name="SchemaGlobalContext" if="xpath xquery core">
       <choice>
         <ref name="QName"/>
  -      <sequence>
  -        <ref name="Type"/>
  -        <ref name="QName"/>
  -      </sequence>
  +      <ref name="TypeQName"/>
       </choice>
     </production>
   
  @@ -2013,6 +2179,18 @@
       <ref name="QName"/>
     </production>
   
  +  <production name="TypeDeclaration" if="xquery core">
  +    <ref name="As"/>
  +    <ref name="SequenceType"/>
  +  </production>
  +
  +  <production name="SingleType" if="xquery core xpath">
  +    <ref name="AtomicType"/>
  +    <optional>
  +      <ref name="QMark"/>
  +    </optional>
  +  </production>
  +
     <production name="SequenceType" if="xquery core xpath">
          <choice>
         <sequence>
  @@ -2022,13 +2200,6 @@
         <ref name="Empty"/>
                </choice>
     </production>
  -
  -  <production name="Binding" if="xquery core">
  -             <optional>
  -                     <ref name="SequenceType"/>
  -             </optional>
  -             <ref name="VariableIndicator"/>
  -  </production>
        
     <production name="ItemType" if="xquery core xpath">
       <choice break="true">
  @@ -2093,7 +2264,7 @@
     <production name="OccurrenceIndicator" if="xquery core xpath">
       <optional>
         <choice>
  -        <!-- ref name="Star" if="xpath xquery core"/ -->
  +        <ref name="Star" if="xpath xquery core" show="no"/>
           <ref name="Multiply" if="xpath xquery core"/>
           <ref name="Plus"/>
           <ref name="QMark"/>
  @@ -2189,7 +2360,7 @@
       <string>{</string>
     </token>
   
  -  <token name="LbraceExprEnclosure" if="xquery core" override="true">
  +  <token name="LbraceExprEnclosure" if="xquery core xpath" override="true">
       <string>{</string>
     </token>
   
  @@ -2243,7 +2414,7 @@
       </oneOrMore>
     </token -->
   
  -  <production name="ElementConstructor" if="xquery">
  +  <production name="ElementConstructor" if="xquery" 
whitespace-spec="explicit">
       <choice name="TagOpenStart">
         <ref name="StartTagOpenRoot" show="no"/>
         <ref name="StartTagOpen"/>
  @@ -2280,7 +2451,7 @@
           <ref name="ElementQNameLbrace"/>
           <sequence>
             <ref name="ElementLbrace"/>
  -          <ref name="ExprSequence"/>
  +          <ref name="Expr"/>
             <ref name="Rbrace"/>
             <ref name="LbraceExprEnclosure"/>
           </sequence>
  @@ -2296,7 +2467,7 @@
           <ref name="AttributeQNameLbrace"/>
           <sequence>
             <ref name="AttributeLbrace"/>
  -          <ref name="ExprSequence"/>
  +          <ref name="Expr"/>
             <ref name="Rbrace"/>
             <ref name="LbraceExprEnclosure"/>
           </sequence>
  @@ -2307,7 +2478,15 @@
       <ref name="Rbrace"/>
     </production>
   
  -  <production name="CdataSection" if="xquery core">
  +  <production name="ComputedTextConstructor" if="xquery core">
  +    <ref name="TextLbrace"/>
  +    <optional>
  +      <ref name="ExprSequence"/>
  +    </optional>
  +    <ref name="Rbrace"/>
  +  </production>
  +
  +  <production name="CdataSection" if="xquery core" 
whitespace-spec="significant">
       <ref name="CdataSectionStart"/>
       <zeroOrMore>
         <ref name="Char"/>
  @@ -2315,7 +2494,7 @@
       <ref name="CdataSectionEnd"/>
     </production>
   
  -  <production name="XmlProcessingInstruction" if="xquery core">
  +  <production name="XmlProcessingInstruction" if="xquery core" 
whitespace-spec="significant">
       <ref name="ProcessingInstructionStart"/>
       <ref name="PITarget"/>
       <zeroOrMore>
  @@ -2324,7 +2503,7 @@
       <ref name="ProcessingInstructionEnd"/>
     </production>
   
  -  <production name="XmlComment" if="xquery core">
  +  <production name="XmlComment" if="xquery core" 
whitespace-spec="significant">
       <ref name="XmlCommentStart"/>
       <zeroOrMore>
         <ref name="Char"/>
  @@ -2332,7 +2511,7 @@
       <ref name="XmlCommentEnd"/>
     </production>
   
  -  <production name="ElementContent" if="xquery">
  +  <production name="ElementContent" if="xquery" 
whitespace-spec="significant">
       <choice break="true">
         <ref name="Char"/>
         <ref name="LCurlyBraceEscape"/>
  @@ -2347,7 +2526,7 @@
       </choice>
     </production>
   
  -  <production name="AttributeList" if="xquery">
  +  <production name="AttributeList" if="xquery" whitespace-spec="explicit">
          <zeroOrMore name="optionalAttribute">
                        <ref name="S"/>
                        <optional>
  @@ -2364,7 +2543,7 @@
       </zeroOrMore>
     </production>
   
  -  <production name="AttributeValue" if="xquery">
  +  <production name="AttributeValue" if="xquery" 
whitespace-spec="significant">
       <choice break="true">
         <sequence>
           <ref name="OpenQuot"/>
  @@ -2389,7 +2568,7 @@
       </choice>
     </production>
   
  -  <production name="AttributeValueContent" if="xquery">
  +  <production name="AttributeValueContent" if="xquery" 
whitespace-spec="significant">
       <choice break="true">
         <ref name="Char"/>
         <ref name="CharRef"/>
  @@ -2403,7 +2582,7 @@
   
     <production name="EnclosedExpr" if="xquery core">
       <choice>
  -      <ref name="Lbrace"/>
  +      <ref name="Lbrace" show="no"/>
         <ref name="LbraceExprEnclosure"/>
       </choice>
       <ref name="ExprSequence"/>
  @@ -2419,18 +2598,24 @@
                </choice>
     </production>
   
  +  <production name="DefaultCollationDecl" if="xquery core">
  +    <ref name="DefaultCollationEquals"/>
  +    <!-- ref name="StringLiteral"/ -->
  +    <ref name="URLLiteral"/>
  +  </production>
  +
     <production name="NamespaceDecl" if="xquery core">
       <ref name="DeclareNamespace"/>
       <ref name="NCNameForPrefix"/>
       <ref name="AssignEquals"/>
  -    <ref name="NamespaceURLLiteral"/>
  +    <ref name="URLLiteral"/>
     </production>
   
     <production name="SubNamespaceDecl" if="xquery core">
       <ref name="Namespace"/>
       <ref name="NCNameForPrefix"/>
       <ref name="AssignEquals"/>
  -    <ref name="NamespaceURLLiteral"/>
  +    <ref name="URLLiteral"/>
     </production>
   
     <production name="DefaultNamespaceDecl" if="xquery core">
  @@ -2440,7 +2625,7 @@
       </choice>
       <ref name="Namespace"/>
       <ref name="AssignEquals"/>
  -    <ref name="NamespaceURLLiteral"/>
  +    <ref name="URLLiteral"/>
     </production>
   
     <!-- production name="ContextDecl" if="xquery core">
  @@ -2453,15 +2638,15 @@
   
     <production name="FunctionDefn" if="xquery core">
       <ref name="DefineFunction"/>
  -    <ref name="FuncName"/>
  -       <ref name="FuncPListOpen"/>
  +    <ref name="QNameLpar"/>
  +       <!-- ref name="FuncPListOpen"/ -->
       <optional>
         <ref name="ParamList"/>
       </optional>
       <choice>
         <ref name="Rpar"/>
         <sequence if="xquery core">
  -        <ref name="RparReturns"/>
  +        <ref name="RparAs"/>
           <!-- Was Datatype -->
           <ref name="SequenceType"/>
         </sequence>
  @@ -2486,8 +2671,6 @@
         <ref name="DefaultNamespaceDecl"/>
       </choice>
       <optional>
  -      <!-- ref name="AtKeyword"/>
  -      <ref name="StringLiteral"/ -->
         <ref name="AtStringLiteral"/>
       </optional>
     </production>
  @@ -2598,19 +2781,19 @@
        </production -->
   
     <!-- ==================== XPath 1.0 =========================-->
  -  <production name="RHSStepExpr" if="pathx1">
  +  <!-- production name="RHSStepExpr" if="pathx1">
       <choice>
         <ref name="AxisStep"/>
         <ref name="RHSGeneralStepExpr"/>
       </choice>
  -  </production>
  +  </production -->
   
  -  <production name="RHSGeneralStepExpr" if="pathx1">
  +  <!-- production name="RHSGeneralStepExpr" if="pathx1">
       <ref name="RHSPrimaryExpr"/>
       <ref name="RHSStepQualifiers"/>
  -  </production>
  +  </production -->
   
  -  <production name="RHSStepQualifiers" if="pathx1">
  +  <!-- production name="RHSStepQualifiers" if="pathx1">
       <zeroOrMore>
         <choice>
           <sequence>
  @@ -2620,19 +2803,15 @@
           </sequence>
         </choice>
       </zeroOrMore>
  -  </production>
  +  </production -->
   
     <production name="RHSPrimaryExpr" if="pathx1">
       <choice break="true">
  -      <ref name="Dot"/>
  -      <ref name="DotDot"/>
  -      <ref name="Wildcard"/>
  -      <ref name="KindTest"/>
  -      <ref name="ElementName"/>
  -
  -      <!-- ref name="Variable"/>
  -      <ref name="Literal"/>
  -      <ref name="ParenthesizedExpr"/ -->
  +      <ref name="StepExpr" if="pathx1"/>
  +      <sequence>
  +        <ref name="PrimaryExpr" if="pathx1"/>
  +        <ref name="Predicates"/>
  +      </sequence>
       </choice>
     </production>
   
  @@ -2648,14 +2827,14 @@
       </charClass>
     </token>
   
  -  <token name="Letter" inline="false" is-macro="yes">
  +  <token name="Letter" inline="false" is-macro="yes" is-xml="yes">
       <choice>
         <ref name="BaseChar"/>
         <ref name="Ideographic"/>
       </choice>
     </token>
   
  -  <token name="BaseChar" inline="false" is-macro="yes">
  +  <token name="BaseChar" inline="false" is-macro="yes" is-xml="yes">
       <charClass>
         <charCodeRange minValue="0041" maxValue="005a"/>
         <charCodeRange minValue="0061" maxValue="007a"/>
  @@ -2862,7 +3041,7 @@
       </charClass>
     </token>
   
  -  <token name="Ideographic" inline="false" is-macro="yes">
  +  <token name="Ideographic" inline="false" is-macro="yes" is-xml="yes">
       <charClass>
         <charCodeRange minValue="4e00" maxValue="9fa5"/>
         <charCode value="3007"/>
  @@ -2870,7 +3049,7 @@
       </charClass>
     </token>
   
  -  <token name="CombiningChar" inline="false" is-macro="yes">
  +  <token name="CombiningChar" inline="false" is-macro="yes" is-xml="yes">
       <charClass>
         <charCodeRange minValue="0300" maxValue="0345"/>
         <charCodeRange minValue="0360" maxValue="0361"/>
  @@ -2970,7 +3149,7 @@
       </charClass>
     </token>
   
  -  <token name="Digit" inline="false" is-macro="yes">
  +  <token name="Digit" inline="false" is-macro="yes" is-xml="yes">
       <charClass>
         <charCodeRange minValue="0030" maxValue="0039"/>
         <charCodeRange minValue="0660" maxValue="0669"/>
  @@ -2990,7 +3169,7 @@
       </charClass>
     </token>
   
  -  <token name="Extender" inline="false" is-macro="yes">
  +  <token name="Extender" inline="false" is-macro="yes" is-xml="yes">
       <charClass>
         <charCode value="00b7"/>
         <charCode value="02d0"/>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.41.6.1.2.6 +6 -6      
xml-xalan/java/src/org/apache/xml/dtm/ref/DTMManagerDefault.java
  
  Index: DTMManagerDefault.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/DTMManagerDefault.java,v
  retrieving revision 1.41.6.1.2.5
  retrieving revision 1.41.6.1.2.6
  diff -u -r1.41.6.1.2.5 -r1.41.6.1.2.6
  --- DTMManagerDefault.java    11 Nov 2002 19:51:17 -0000      1.41.6.1.2.5
  +++ DTMManagerDefault.java    13 Nov 2002 05:27:34 -0000      1.41.6.1.2.6
  @@ -79,7 +79,7 @@
   import org.apache.xml.dtm.ref.xni2dtm.XNI2DTM;
   import org.apache.xml.dtm.ref.xni2dtm.XNISource;
   // EXPERIMENTAL 9/18/02
  -import org.apache.xml.dtm.dom2dtm2.DOM2DTM2;
  +// import org.apache.xml.dtm.dom2dtm2.DOM2DTM2;
   /**************************************************************/
   
   // W3C DOM
  @@ -297,11 +297,11 @@
         if(ATTEMPT_DOM2DTM2)
         {
                DTM dtm;        
  -             try
  -             {
  -           dtm = new DOM2DTM2(this, source, documentID,
  -                                whiteSpaceFilter, xstringFactory, 
doIndexing);
  -             } catch(ClassCastException e)
  +//           try
  +//           {
  +//         dtm = new DOM2DTM2(this, source, documentID,
  +//                                whiteSpaceFilter, xstringFactory, 
doIndexing);
  +//           } catch(ClassCastException e)
                {
              dtm = new DOM2DTM(this, (DOMSource) source, documentID,
                                   whiteSpaceFilter, xstringFactory, 
doIndexing);
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.24.2.1.2.1 +1 -0      xml-xalan/java/src/org/apache/xpath/XPath.java
  
  Index: XPath.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/XPath.java,v
  retrieving revision 1.24.2.1
  retrieving revision 1.24.2.1.2.1
  diff -u -r1.24.2.1 -r1.24.2.1.2.1
  --- XPath.java        14 Aug 2002 20:06:57 -0000      1.24.2.1
  +++ XPath.java        13 Nov 2002 05:27:34 -0000      1.24.2.1.2.1
  @@ -75,6 +75,7 @@
   import org.apache.xpath.objects.XNodeSequenceSingleton;
   import org.apache.xpath.objects.XObject;
   import org.apache.xpath.parser.ParseException;
  +import org.apache.xpath.parser.RootOfRoot;
   import org.apache.xpath.res.XPATHErrorResources;
   import org.w3c.dom.Node;
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1.2.1 +2 -2      
xml-xalan/java/src/org/apache/xpath/parser/Attic/NonExecutableExpression.java
  
  Index: NonExecutableExpression.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xpath/parser/Attic/NonExecutableExpression.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.1.2.1
  diff -u -r1.1.2.1 -r1.1.2.1.2.1
  --- NonExecutableExpression.java      14 Aug 2002 20:07:07 -0000      1.1.2.1
  +++ NonExecutableExpression.java      13 Nov 2002 05:27:34 -0000      
1.1.2.1.2.1
  @@ -19,7 +19,7 @@
   public class NonExecutableExpression extends Expression
   {
     protected XPath m_parser; // I'm going to leave this for right now only.
  -
  +  
     public NonExecutableExpression(XPath parser, String value)
     {
        m_parser = parser;
  @@ -71,7 +71,7 @@
     
     public String toString() 
     { 
  -     return this.getClass().getName()+ ((null == m_value) ? "" : (" 
"+m_value)); 
  +     return this.getClass().getName()+((null == m_value) ? "" : (" 
"+m_value)); 
     }
   
   
  
  
  
  1.1.2.1.2.1 +5 -0      
xml-xalan/java/src/org/apache/xpath/parser/Attic/RootOfRoot.java
  
  Index: RootOfRoot.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xpath/parser/Attic/RootOfRoot.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.1.2.1
  diff -u -r1.1.2.1 -r1.1.2.1.2.1
  --- RootOfRoot.java   14 Aug 2002 20:07:07 -0000      1.1.2.1
  +++ RootOfRoot.java   13 Nov 2002 05:27:34 -0000      1.1.2.1.2.1
  @@ -21,6 +21,11 @@
     {
        // We don't want this node to any longer be the child's parent!
        Node n = jjtGetChild(0);
  +    if(n instanceof RootOfRoot)
  +    {
  +      n = n.jjtGetChild(0);
  +      this.jjtAddChild(n, 0);
  +    }
        n.jjtSetParent(null);
        super.jjtClose();
     }
  
  
  
  1.1.2.1.2.15 +46 -36    
xml-xalan/java/src/org/apache/xpath/parser/Attic/SimpleNode.java
  
  Index: SimpleNode.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xpath/parser/Attic/SimpleNode.java,v
  retrieving revision 1.1.2.1.2.14
  retrieving revision 1.1.2.1.2.15
  diff -u -r1.1.2.1.2.14 -r1.1.2.1.2.15
  --- SimpleNode.java   28 Oct 2002 16:17:34 -0000      1.1.2.1.2.14
  +++ SimpleNode.java   13 Nov 2002 05:27:34 -0000      1.1.2.1.2.15
  @@ -8,9 +8,9 @@
   import org.apache.xml.utils.QName;
   import org.apache.xpath.Expression;
   import org.apache.xpath.ExpressionNode;
  -import org.apache.xpath.axes.UnionPathIterator;
   import org.apache.xpath.axes.ExceptPathIterator;
   import org.apache.xpath.axes.IntersectPathIterator;
  +import org.apache.xpath.axes.UnionPathIterator;
   import org.apache.xpath.axes.WalkerFactory;
   import org.apache.xpath.functions.*;
   import org.apache.xpath.objects.XDecimal;
  @@ -21,6 +21,7 @@
   import org.apache.xpath.patterns.StepPattern;
   import org.apache.xpath.seqctor.ExprSequence;
   import org.apache.xpath.seqctor.FLWRExpr;
  +import org.apache.xpath.types.CastableExpr;
   import org.apache.xpath.types.InstanceofExpr;
   
   /**
  @@ -454,6 +455,11 @@
           newNode = new RootOfRoot(p);
           break;
   
  +      case XPathTreeConstants.JJTXPATH :
  +        // I'm not so sure this one should be canceled out...
  +        newNode = new RootOfRoot(p);
  +        break;
  +
           // === MATCH EXPRESSIONS === 
         case XPathTreeConstants.JJTMATCHPATTERN :
           // See comment above.
  @@ -679,25 +685,22 @@
         case XPathTreeConstants.JJTUNIONEXPR :
           newNode = new UnionPathIterator();
           break;
  -      case XPathTreeConstants.JJTINTERSECTEXPR :
  -        //newNode = new NonExecutableExpression(p, "JJTUNIONEXPR");
  -        newNode = new IntersectPathIterator();
  -        break;
  -        case XPathTreeConstants.JJTEXCEPTEXPR :
  -        //newNode = new NonExecutableExpression(p, "JJTUNIONEXPR");
  -        newNode = new ExceptPathIterator();
  -        break;
  -        //                   case XPathTreeConstants.JJTUNION:
  -        //                           newNode = new SimpleNode();
  -        //                           break;
  -        //                   case XPathTreeConstants.JJTVBAR:
  -        //                           newNode = new SimpleNode();
  -        //                           break;
  -        //                   case XPathTreeConstants.JJTRELATIVEPATHPATTERN:
  -        //                           newNode = new SimpleNode();
  -        //                           break;
  -
  -        // === FUNCTIONS === 
  +      case XPathTreeConstants.JJTINTERSECTEXCEPTEXPR :
  +        {
  +          Token operator = (Token) p.binaryTokenStack.peek();
  +          switch (operator.kind)
  +          {
  +            case XPathConstants.Intersect :
  +              newNode = new IntersectPathIterator();
  +              break;
  +            case XPathConstants.Except :
  +              newNode = new ExceptPathIterator();
  +              break;
  +            default :
  +              System.err.println("Assertion: should never happen!");
  +          }
  +        }
  +        break;
         case XPathTreeConstants.JJTIDKEYPATTERN :
           {
             FunctionPattern fpat = new FunctionPattern();
  @@ -827,12 +830,13 @@
               case XPathConstants.GtGt :
                 newNode = new org.apache.xpath.operations.GtGt();
                 break;
  -            case XPathConstants.Precedes :
  -              newNode = new org.apache.xpath.operations.Precedes();
  -              break;
  -            case XPathConstants.Follows :
  -              newNode = new org.apache.xpath.operations.Follows();
  -              break;
  +              // I think these went away.  -sb
  +//            case XPathConstants.Precedes :
  +//              newNode = new org.apache.xpath.operations.Precedes();
  +//              break;
  +//            case XPathConstants.Follows :
  +//              newNode = new org.apache.xpath.operations.Follows();
  +//              break;
             }
           }
           break;
  @@ -960,7 +964,7 @@
         case XPathTreeConstants.JJTFLWREXPR :
           newNode = new FLWRExpr();
           break;
  -      case XPathTreeConstants.JJTFORCLAUSE :
  +      case XPathTreeConstants.JJTSIMPLEFORCLAUSE :
           newNode = new org.apache.xpath.parser.ForClause(p);
           break;
         case XPathTreeConstants.JJTRETURN :
  @@ -974,15 +978,21 @@
         case XPathTreeConstants.JJTINSTANCEOF :
           newNode = new Instanceof(p);
           break;
  -      case XPathTreeConstants.JJTVALIDATEEXPR :
  -        newNode = new NonExecutableExpression(p, "JJTVALIDATEEXPR");
  +      case XPathTreeConstants.JJTCASTABLEEXPR :
  +        newNode = new CastableExpr();
           break;
  -      case XPathTreeConstants.JJTVALIDATE :
  -        newNode = new NonExecutableExpression(p, "JJTVALIDATE");
  +      case XPathTreeConstants.JJTCASTABLE :
  +        newNode = new Castable(p);
           break;
  -      case XPathTreeConstants.JJTLBRACE :
  -        newNode = new NonExecutableExpression(p, "JJTLBRACE");
  +//      case XPathTreeConstants.JJTVALIDATE :
  +//        newNode = new NonExecutableExpression(p, "JJTVALIDATEEXPR");
  +//        break;
  +      case XPathTreeConstants.JJTVALIDATEEXPR :
  +        newNode = new NonExecutableExpression(p, "JJTVALIDATE");
           break;
  +//      case XPathTreeConstants.JJTLBRACE :
  +//        newNode = new NonExecutableExpression(p, "JJTLBRACE");
  +//        break;
         case XPathTreeConstants.JJTRBRACE :
           newNode = new NonExecutableExpression(p, "JJTRBRACE");
           break;
  @@ -1001,9 +1011,9 @@
         case XPathTreeConstants.JJTSCHEMAGLOBALCONTEXT :
           newNode = new SchemaGlobalContext(p, "JJTSCHEMAGLOBALCONTEXT");
           break;
  -      case XPathTreeConstants.JJTTYPE :
  -        newNode = new NonExecutableExpression(p, "JJTTYPE");
  -        break;
  +//      case XPathTreeConstants.JJTTYPE :
  +//        newNode = new NonExecutableExpression(p, "JJTTYPE");
  +//        break;
         case XPathTreeConstants.JJTSCHEMACONTEXTSTEP :
           newNode = new SchemaContextStep(p);
           break;
  
  
  
  1.1.2.1.2.2 +561 -335  
xml-xalan/java/src/org/apache/xpath/parser/Attic/XPath.java
  
  Index: XPath.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xpath/parser/Attic/XPath.java,v
  retrieving revision 1.1.2.1.2.1
  retrieving revision 1.1.2.1.2.2
  diff -u -r1.1.2.1.2.1 -r1.1.2.1.2.2
  --- XPath.java        19 Sep 2002 21:43:30 -0000      1.1.2.1.2.1
  +++ XPath.java        13 Nov 2002 05:27:34 -0000      1.1.2.1.2.2
  @@ -134,7 +134,7 @@
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);
       try {
  -      Expr();
  +      XPath();
         jj_consume_token(0);
                       jjtree.closeNodeScope(jjtn000, true);
                       jjtc000 = false;
  @@ -194,6 +194,83 @@
       throw new Error("Missing return statement in function");
     }
   
  +  final public void XPath() throws ParseException {
  + /[EMAIL PROTECTED](jjtree) XPath */
  +  SimpleNode jjtn000 = (SimpleNode)SimpleNode.jjtCreate(this, JJTXPATH);
  +  boolean jjtc000 = true;
  +  jjtree.openNodeScope(jjtn000);
  +    try {
  +      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  +      case IntegerLiteral:
  +      case DecimalLiteral:
  +      case DoubleLiteral:
  +      case StringLiteral:
  +      case AxisChild:
  +      case AxisDescendant:
  +      case AxisParent:
  +      case AxisAttribute:
  +      case AxisSelf:
  +      case AxisDescendantOrSelf:
  +      case AxisAncestor:
  +      case AxisFollowingSibling:
  +      case AxisPrecedingSibling:
  +      case AxisFollowing:
  +      case AxisPreceding:
  +      case AxisNamespace:
  +      case AxisAncestorOrSelf:
  +      case Star:
  +      case NCNameColonStar:
  +      case StarColonNCName:
  +      case Root:
  +      case RootDescendants:
  +      case Minus:
  +      case Plus:
  +      case Lpar:
  +      case At:
  +      case Some:
  +      case Every:
  +      case ForVariable:
  +      case CastAs:
  +      case TreatAs:
  +      case ValidateLbrace:
  +      case ValidateContext:
  +      case NodeLpar:
  +      case CommentLpar:
  +      case TextLpar:
  +      case ProcessingInstructionLpar:
  +      case IfLpar:
  +      case Dot:
  +      case DotDot:
  +      case VariableIndicator:
  +      case QName:
  +      case QNameLpar:
  +        ExprSequence();
  +        break;
  +      default:
  +        jj_la1[0] = jj_gen;
  +        ;
  +      }
  +    } catch (Throwable jjte000) {
  +    if (jjtc000) {
  +      jjtree.clearNodeScope(jjtn000);
  +      jjtc000 = false;
  +    } else {
  +      jjtree.popNode();
  +    }
  +    if (jjte000 instanceof RuntimeException) {
  +      {if (true) throw (RuntimeException)jjte000;}
  +    }
  +    if (jjte000 instanceof ParseException) {
  +      {if (true) throw (ParseException)jjte000;}
  +    }
  +    {if (true) throw (Error)jjte000;}
  +    } finally {
  +    if (jjtc000) {
  +      jjtree.closeNodeScope(jjtn000, true);
  +    }
  +    }
  +  }
  +
     final public void ExprSequence() throws ParseException {
    /[EMAIL PROTECTED](jjtree) ExprSequence */
     SimpleNode jjtn000 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTEXPRSEQUENCE);
  @@ -208,7 +285,7 @@
             ;
             break;
           default:
  -          jj_la1[0] = jj_gen;
  +          jj_la1[1] = jj_gen;
             break label_1;
           }
           jj_consume_token(Comma);
  @@ -253,14 +330,14 @@
             jj_consume_token(Vbar);
             break;
           default:
  -          jj_la1[1] = jj_gen;
  +          jj_la1[2] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
           Pattern();
           break;
         default:
  -        jj_la1[2] = jj_gen;
  +        jj_la1[3] = jj_gen;
           ;
         }
       } catch (Throwable jjte000) {
  @@ -320,7 +397,7 @@
             RelativePathPattern();
             break;
           default:
  -          jj_la1[3] = jj_gen;
  +          jj_la1[4] = jj_gen;
             ;
           }
           break;
  @@ -377,14 +454,14 @@
               }
               break;
             default:
  -            jj_la1[4] = jj_gen;
  +            jj_la1[5] = jj_gen;
               jj_consume_token(-1);
               throw new ParseException();
             }
             RelativePathPattern();
             break;
           default:
  -          jj_la1[5] = jj_gen;
  +          jj_la1[6] = jj_gen;
             ;
           }
           break;
  @@ -402,7 +479,7 @@
           RelativePathPattern();
           break;
         default:
  -        jj_la1[6] = jj_gen;
  +        jj_la1[7] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
  @@ -464,14 +541,14 @@
           }
           break;
         default:
  -        jj_la1[7] = jj_gen;
  +        jj_la1[8] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
         RelativePathPattern();
         break;
       default:
  -      jj_la1[8] = jj_gen;
  +      jj_la1[9] = jj_gen;
         ;
       }
     }
  @@ -489,7 +566,7 @@
           PatternAxis();
           break;
         default:
  -        jj_la1[9] = jj_gen;
  +        jj_la1[10] = jj_gen;
           ;
         }
         NodeTest();
  @@ -563,7 +640,7 @@
         }
         break;
       default:
  -      jj_la1[10] = jj_gen;
  +      jj_la1[11] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
  @@ -595,7 +672,7 @@
           IdKeyValue();
           break;
         default:
  -        jj_la1[11] = jj_gen;
  +        jj_la1[12] = jj_gen;
           ;
         }
         jj_consume_token(Rpar);
  @@ -622,16 +699,9 @@
   
     final public void IdKeyValue() throws ParseException {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  -    case IntegerLiteral:
  -    case DecimalLiteral:
  -    case DoubleLiteral:
       case StringLiteral:
  -      Literal();
  -      break;
  -    case VariableIndicator:
  -      jj_consume_token(VariableIndicator);
  -      jj_consume_token(VarName);
  -                SimpleNode jjtn001 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTVARNAME);
  +      jj_consume_token(StringLiteral);
  +                SimpleNode jjtn001 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTSTRINGLITERAL);
                   boolean jjtc001 = true;
                   jjtree.openNodeScope(jjtn001);
         try {
  @@ -644,8 +714,24 @@
                   }
         }
         break;
  +    case VariableIndicator:
  +      jj_consume_token(VariableIndicator);
  +      jj_consume_token(VarName);
  +                SimpleNode jjtn002 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTVARNAME);
  +                boolean jjtc002 = true;
  +                jjtree.openNodeScope(jjtn002);
  +      try {
  +                jjtree.closeNodeScope(jjtn002,  true);
  +                jjtc002 = false;
  +               jjtn002.processToken(token);
  +      } finally {
  +                if (jjtc002) {
  +                  jjtree.closeNodeScope(jjtn002,  true);
  +                }
  +      }
  +      break;
       default:
  -      jj_la1[12] = jj_gen;
  +      jj_la1[13] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
  @@ -664,7 +750,7 @@
           ;
           break;
         default:
  -        jj_la1[13] = jj_gen;
  +        jj_la1[14] = jj_gen;
           break label_2;
         }
         jj_consume_token(Or);
  @@ -703,7 +789,7 @@
           ;
           break;
         default:
  -        jj_la1[14] = jj_gen;
  +        jj_la1[15] = jj_gen;
           break label_3;
         }
         jj_consume_token(And);
  @@ -746,10 +832,10 @@
             ;
             break;
           default:
  -          jj_la1[15] = jj_gen;
  +          jj_la1[16] = jj_gen;
             break label_4;
           }
  -        ForClause();
  +        SimpleForClause();
           jj_consume_token(Return);
                   SimpleNode jjtn001 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTRETURN);
                   boolean jjtc001 = true;
  @@ -800,7 +886,7 @@
             ;
             break;
           default:
  -          jj_la1[16] = jj_gen;
  +          jj_la1[17] = jj_gen;
             break label_5;
           }
           switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  @@ -835,7 +921,7 @@
             }
             break;
           default:
  -          jj_la1[17] = jj_gen;
  +          jj_la1[18] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
  @@ -873,7 +959,7 @@
               ;
               break;
             default:
  -            jj_la1[18] = jj_gen;
  +            jj_la1[19] = jj_gen;
               break label_6;
             }
             jj_consume_token(Comma);
  @@ -955,7 +1041,7 @@
             ;
             break;
           default:
  -          jj_la1[19] = jj_gen;
  +          jj_la1[20] = jj_gen;
             break label_7;
           }
           jj_consume_token(IfLpar);
  @@ -1029,17 +1115,9 @@
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);
       try {
  -      ComparisonExpr();
  -      label_8:
  -      while (true) {
  -        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  -        case Instanceof:
  -          ;
  -          break;
  -        default:
  -          jj_la1[20] = jj_gen;
  -          break label_8;
  -        }
  +      CastableExpr();
  +      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  +      case Instanceof:
           jj_consume_token(Instanceof);
                   SimpleNode jjtn001 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTINSTANCEOF);
                   boolean jjtc001 = true;
  @@ -1054,6 +1132,59 @@
                   }
           }
           SequenceType();
  +        break;
  +      default:
  +        jj_la1[21] = jj_gen;
  +        ;
  +      }
  +    } catch (Throwable jjte000) {
  +    if (jjtc000) {
  +      jjtree.clearNodeScope(jjtn000);
  +      jjtc000 = false;
  +    } else {
  +      jjtree.popNode();
  +    }
  +    if (jjte000 instanceof RuntimeException) {
  +      {if (true) throw (RuntimeException)jjte000;}
  +    }
  +    if (jjte000 instanceof ParseException) {
  +      {if (true) throw (ParseException)jjte000;}
  +    }
  +    {if (true) throw (Error)jjte000;}
  +    } finally {
  +    if (jjtc000) {
  +      jjtree.closeNodeScope(jjtn000, true);
  +    }
  +    }
  +  }
  +
  +  final public void CastableExpr() throws ParseException {
  + /[EMAIL PROTECTED](jjtree) CastableExpr */
  +  SimpleNode jjtn000 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTCASTABLEEXPR);
  +  boolean jjtc000 = true;
  +  jjtree.openNodeScope(jjtn000);
  +    try {
  +      ComparisonExpr();
  +      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  +      case Castable:
  +        jj_consume_token(Castable);
  +                SimpleNode jjtn001 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTCASTABLE);
  +                boolean jjtc001 = true;
  +                jjtree.openNodeScope(jjtn001);
  +        try {
  +                jjtree.closeNodeScope(jjtn001,  true);
  +                jjtc001 = false;
  +               jjtn001.processToken(token);
  +        } finally {
  +                if (jjtc001) {
  +                  jjtree.closeNodeScope(jjtn001,  true);
  +                }
  +        }
  +        SingleType();
  +        break;
  +      default:
  +        jj_la1[22] = jj_gen;
  +        ;
         }
       } catch (Throwable jjte000) {
       if (jjtc000) {
  @@ -1078,11 +1209,9 @@
   
     final public void ComparisonExpr() throws ParseException {
       RangeExpr();
  -    label_9:
  +    label_8:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  -      case Precedes:
  -      case Follows:
         case Equals:
         case Is:
         case NotEquals:
  @@ -1102,8 +1231,8 @@
           ;
           break;
         default:
  -        jj_la1[21] = jj_gen;
  -        break label_9;
  +        jj_la1[23] = jj_gen;
  +        break label_8;
         }
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case FortranEq:
  @@ -1126,14 +1255,12 @@
         case IsNot:
           NodeComp();
           break;
  -      case Precedes:
  -      case Follows:
         case LtLt:
         case GtGt:
           OrderComp();
           break;
         default:
  -        jj_la1[22] = jj_gen;
  +        jj_la1[24] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
  @@ -1164,16 +1291,8 @@
   
     final public void RangeExpr() throws ParseException {
       AdditiveExpr();
  -    label_10:
  -    while (true) {
  -      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  -      case To:
  -        ;
  -        break;
  -      default:
  -        jj_la1[23] = jj_gen;
  -        break label_10;
  -      }
  +    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  +    case To:
         jj_consume_token(To);
             binaryTokenStack.push(token);
         AdditiveExpr();
  @@ -1198,12 +1317,16 @@
                       jjtree.closeNodeScope(jjtn001,  2);
                     }
         }
  +      break;
  +    default:
  +      jj_la1[25] = jj_gen;
  +      ;
       }
     }
   
     final public void AdditiveExpr() throws ParseException {
       MultiplicativeExpr();
  -    label_11:
  +    label_9:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case Minus:
  @@ -1211,8 +1334,8 @@
           ;
           break;
         default:
  -        jj_la1[24] = jj_gen;
  -        break label_11;
  +        jj_la1[26] = jj_gen;
  +        break label_9;
         }
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case Plus:
  @@ -1224,7 +1347,7 @@
             binaryTokenStack.push(token);
           break;
         default:
  -        jj_la1[25] = jj_gen;
  +        jj_la1[27] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
  @@ -1254,8 +1377,8 @@
     }
   
     final public void MultiplicativeExpr() throws ParseException {
  -    UnionExpr();
  -    label_12:
  +    UnaryExpr();
  +    label_10:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case Div:
  @@ -1265,8 +1388,8 @@
           ;
           break;
         default:
  -        jj_la1[26] = jj_gen;
  -        break label_12;
  +        jj_la1[28] = jj_gen;
  +        break label_10;
         }
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case Multiply:
  @@ -1286,11 +1409,11 @@
             binaryTokenStack.push(token);
           break;
         default:
  -        jj_la1[27] = jj_gen;
  +        jj_la1[29] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
  -      UnionExpr();
  +      UnaryExpr();
                     SimpleNode jjtn001 = 
(SimpleNode)SimpleNode.jjtCreate(this, JJTMULTIPLICATIVEEXPR);
                     boolean jjtc001 = true;
                     jjtree.openNodeScope(jjtn001);
  @@ -1315,9 +1438,85 @@
       }
     }
   
  +  final public void UnaryExpr() throws ParseException {
  + /[EMAIL PROTECTED](jjtree) UnaryExpr */
  +  SimpleNode jjtn000 = (SimpleNode)SimpleNode.jjtCreate(this, JJTUNARYEXPR);
  +  boolean jjtc000 = true;
  +  jjtree.openNodeScope(jjtn000);
  +    try {
  +      label_11:
  +      while (true) {
  +        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  +        case Minus:
  +        case Plus:
  +          ;
  +          break;
  +        default:
  +          jj_la1[30] = jj_gen;
  +          break label_11;
  +        }
  +        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  +        case Minus:
  +          jj_consume_token(Minus);
  +                SimpleNode jjtn001 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTMINUS);
  +                boolean jjtc001 = true;
  +                jjtree.openNodeScope(jjtn001);
  +          try {
  +                jjtree.closeNodeScope(jjtn001,  true);
  +                jjtc001 = false;
  +               jjtn001.processToken(token);
  +          } finally {
  +                if (jjtc001) {
  +                  jjtree.closeNodeScope(jjtn001,  true);
  +                }
  +          }
  +          break;
  +        case Plus:
  +          jj_consume_token(Plus);
  +                SimpleNode jjtn002 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTPLUS);
  +                boolean jjtc002 = true;
  +                jjtree.openNodeScope(jjtn002);
  +          try {
  +                jjtree.closeNodeScope(jjtn002,  true);
  +                jjtc002 = false;
  +               jjtn002.processToken(token);
  +          } finally {
  +                if (jjtc002) {
  +                  jjtree.closeNodeScope(jjtn002,  true);
  +                }
  +          }
  +          break;
  +        default:
  +          jj_la1[31] = jj_gen;
  +          jj_consume_token(-1);
  +          throw new ParseException();
  +        }
  +      }
  +      UnionExpr();
  +    } catch (Throwable jjte000) {
  +    if (jjtc000) {
  +      jjtree.clearNodeScope(jjtn000);
  +      jjtc000 = false;
  +    } else {
  +      jjtree.popNode();
  +    }
  +    if (jjte000 instanceof RuntimeException) {
  +      {if (true) throw (RuntimeException)jjte000;}
  +    }
  +    if (jjte000 instanceof ParseException) {
  +      {if (true) throw (ParseException)jjte000;}
  +    }
  +    {if (true) throw (Error)jjte000;}
  +    } finally {
  +    if (jjtc000) {
  +      jjtree.closeNodeScope(jjtn000, true);
  +    }
  +    }
  +  }
  +
     final public void UnionExpr() throws ParseException {
       IntersectExceptExpr();
  -    label_13:
  +    label_12:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case Union:
  @@ -1325,8 +1524,8 @@
           ;
           break;
         default:
  -        jj_la1[28] = jj_gen;
  -        break label_13;
  +        jj_la1[32] = jj_gen;
  +        break label_12;
         }
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case Union:
  @@ -1338,7 +1537,7 @@
             binaryTokenStack.push(token);
           break;
         default:
  -        jj_la1[29] = jj_gen;
  +        jj_la1[33] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
  @@ -1368,8 +1567,8 @@
     }
   
     final public void IntersectExceptExpr() throws ParseException {
  -    UnaryExpr();
  -    label_14:
  +    ValueExpr();
  +    label_13:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case Intersect:
  @@ -1377,30 +1576,25 @@
           ;
           break;
         default:
  -        jj_la1[30] = jj_gen;
  -        break label_14;
  +        jj_la1[34] = jj_gen;
  +        break label_13;
         }
  -      SimpleNode jjtn001;
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case Intersect:
           jj_consume_token(Intersect);
             binaryTokenStack.push(token);
  -        UnaryExpr();
  -        jjtn001 = (SimpleNode)SimpleNode.jjtCreate(this, JJTINTERSECTEXPR);
           break;
         case Except:
           jj_consume_token(Except);
             binaryTokenStack.push(token);
  -        UnaryExpr();
  -        jjtn001 = (SimpleNode)SimpleNode.jjtCreate(this, JJTEXCEPTEXPR);
           break;
         default:
  -        jj_la1[31] = jj_gen;
  +        jj_la1[35] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
  -      //UnaryExpr();
  -                  //SimpleNode jjtn001 = 
(SimpleNode)SimpleNode.jjtCreate(this, JJTINTERSECTEXCEPTEXPR);
  +      ValueExpr();
  +                  SimpleNode jjtn001 = 
(SimpleNode)SimpleNode.jjtCreate(this, JJTINTERSECTEXCEPTEXPR);
                     boolean jjtc001 = true;
                     jjtree.openNodeScope(jjtn001);
         try {
  @@ -1424,91 +1618,22 @@
       }
     }
   
  -  final public void UnaryExpr() throws ParseException {
  - /[EMAIL PROTECTED](jjtree) UnaryExpr */
  -  SimpleNode jjtn000 = (SimpleNode)SimpleNode.jjtCreate(this, JJTUNARYEXPR);
  -  boolean jjtc000 = true;
  -  jjtree.openNodeScope(jjtn000);
  -    try {
  -      label_15:
  -      while (true) {
  -        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  -        case Minus:
  -        case Plus:
  -          ;
  -          break;
  -        default:
  -          jj_la1[32] = jj_gen;
  -          break label_15;
  -        }
  -        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  -        case Minus:
  -          jj_consume_token(Minus);
  -                SimpleNode jjtn001 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTMINUS);
  -                boolean jjtc001 = true;
  -                jjtree.openNodeScope(jjtn001);
  -          try {
  -                jjtree.closeNodeScope(jjtn001,  true);
  -                jjtc001 = false;
  -               jjtn001.processToken(token);
  -          } finally {
  -                if (jjtc001) {
  -                  jjtree.closeNodeScope(jjtn001,  true);
  -                }
  -          }
  -          break;
  -        case Plus:
  -          jj_consume_token(Plus);
  -                SimpleNode jjtn002 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTPLUS);
  -                boolean jjtc002 = true;
  -                jjtree.openNodeScope(jjtn002);
  -          try {
  -                jjtree.closeNodeScope(jjtn002,  true);
  -                jjtc002 = false;
  -               jjtn002.processToken(token);
  -          } finally {
  -                if (jjtc002) {
  -                  jjtree.closeNodeScope(jjtn002,  true);
  -                }
  -          }
  -          break;
  -        default:
  -          jj_la1[33] = jj_gen;
  -          jj_consume_token(-1);
  -          throw new ParseException();
  -        }
  -      }
  -      ValueExpr();
  -    } catch (Throwable jjte000) {
  -    if (jjtc000) {
  -      jjtree.clearNodeScope(jjtn000);
  -      jjtc000 = false;
  -    } else {
  -      jjtree.popNode();
  -    }
  -    if (jjte000 instanceof RuntimeException) {
  -      {if (true) throw (RuntimeException)jjte000;}
  -    }
  -    if (jjte000 instanceof ParseException) {
  -      {if (true) throw (ParseException)jjte000;}
  -    }
  -    {if (true) throw (Error)jjte000;}
  -    } finally {
  -    if (jjtc000) {
  -      jjtree.closeNodeScope(jjtn000, true);
  -    }
  -    }
  -  }
  -
     final public void ValueExpr() throws ParseException {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  -    case Validate:
  +    case ValidateLbrace:
  +    case ValidateContext:
         ValidateExpr();
         break;
       case CastAs:
  -    case TreatAs:
         CastExpr();
         break;
  +    case TreatAs:
  +      TreatExpr();
  +      break;
  +    case IntegerLiteral:
  +    case DecimalLiteral:
  +    case DoubleLiteral:
  +    case StringLiteral:
       case AxisChild:
       case AxisDescendant:
       case AxisParent:
  @@ -1529,14 +1654,10 @@
       case RootDescendants:
       case Lpar:
       case At:
  -    case IntegerLiteral:
  -    case DecimalLiteral:
  -    case DoubleLiteral:
       case NodeLpar:
       case CommentLpar:
       case TextLpar:
       case ProcessingInstructionLpar:
  -    case StringLiteral:
       case Dot:
       case DotDot:
       case VariableIndicator:
  @@ -1545,7 +1666,7 @@
         PathExpr();
         break;
       default:
  -      jj_la1[34] = jj_gen;
  +      jj_la1[36] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
  @@ -1573,6 +1694,10 @@
                   }
           }
           switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  +        case IntegerLiteral:
  +        case DecimalLiteral:
  +        case DoubleLiteral:
  +        case StringLiteral:
           case AxisChild:
           case AxisDescendant:
           case AxisParent:
  @@ -1591,14 +1716,10 @@
           case StarColonNCName:
           case Lpar:
           case At:
  -        case IntegerLiteral:
  -        case DecimalLiteral:
  -        case DoubleLiteral:
           case NodeLpar:
           case CommentLpar:
           case TextLpar:
           case ProcessingInstructionLpar:
  -        case StringLiteral:
           case Dot:
           case DotDot:
           case VariableIndicator:
  @@ -1607,7 +1728,7 @@
             RelativePathExpr();
             break;
           default:
  -          jj_la1[35] = jj_gen;
  +          jj_la1[37] = jj_gen;
             ;
           }
           break;
  @@ -1627,6 +1748,10 @@
           }
           RelativePathExpr();
           break;
  +      case IntegerLiteral:
  +      case DecimalLiteral:
  +      case DoubleLiteral:
  +      case StringLiteral:
         case AxisChild:
         case AxisDescendant:
         case AxisParent:
  @@ -1645,14 +1770,10 @@
         case StarColonNCName:
         case Lpar:
         case At:
  -      case IntegerLiteral:
  -      case DecimalLiteral:
  -      case DoubleLiteral:
         case NodeLpar:
         case CommentLpar:
         case TextLpar:
         case ProcessingInstructionLpar:
  -      case StringLiteral:
         case Dot:
         case DotDot:
         case VariableIndicator:
  @@ -1661,7 +1782,7 @@
           RelativePathExpr();
           break;
         default:
  -        jj_la1[36] = jj_gen;
  +        jj_la1[38] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
  @@ -1688,7 +1809,7 @@
   
     final public void RelativePathExpr() throws ParseException {
       StepExpr();
  -    label_16:
  +    label_14:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case Slash:
  @@ -1696,8 +1817,8 @@
           ;
           break;
         default:
  -        jj_la1[37] = jj_gen;
  -        break label_16;
  +        jj_la1[39] = jj_gen;
  +        break label_14;
         }
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case Slash:
  @@ -1731,7 +1852,7 @@
           }
           break;
         default:
  -        jj_la1[38] = jj_gen;
  +        jj_la1[40] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
  @@ -1774,17 +1895,17 @@
         case DotDot:
           ReverseStep();
           break;
  -      case Lpar:
         case IntegerLiteral:
         case DecimalLiteral:
         case DoubleLiteral:
         case StringLiteral:
  +      case Lpar:
         case VariableIndicator:
         case QNameLpar:
           PrimaryExpr();
           break;
         default:
  -        jj_la1[39] = jj_gen;
  +        jj_la1[41] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
  @@ -1810,9 +1931,9 @@
       }
     }
   
  -  final public void ForClause() throws ParseException {
  - /[EMAIL PROTECTED](jjtree) ForClause */
  -  SimpleNode jjtn000 = (SimpleNode)SimpleNode.jjtCreate(this, JJTFORCLAUSE);
  +  final public void SimpleForClause() throws ParseException {
  + /[EMAIL PROTECTED](jjtree) SimpleForClause */
  +  SimpleNode jjtn000 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTSIMPLEFORCLAUSE);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);
       try {
  @@ -1844,15 +1965,15 @@
                   }
         }
         Expr();
  -      label_17:
  +      label_15:
         while (true) {
           switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
           case Comma:
             ;
             break;
           default:
  -          jj_la1[40] = jj_gen;
  -          break label_17;
  +          jj_la1[42] = jj_gen;
  +          break label_15;
           }
           jj_consume_token(Comma);
           jj_consume_token(VariableIndicator);
  @@ -1911,53 +2032,94 @@
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);
       try {
  -      jj_consume_token(Validate);
  -                SimpleNode jjtn001 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTVALIDATE);
  +      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  +      case ValidateLbrace:
  +        jj_consume_token(ValidateLbrace);
  +                SimpleNode jjtn001 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTVALIDATELBRACE);
                   boolean jjtc001 = true;
                   jjtree.openNodeScope(jjtn001);
  -      try {
  +        try {
                   jjtree.closeNodeScope(jjtn001,  true);
                   jjtc001 = false;
                  jjtn001.processToken(token);
  -      } finally {
  +        } finally {
                   if (jjtc001) {
                     jjtree.closeNodeScope(jjtn001,  true);
                   }
  -      }
  -      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  -      case In:
  -        SchemaContext();
  +        }
           break;
  -      default:
  -        jj_la1[41] = jj_gen;
  -        ;
  -      }
  -      jj_consume_token(Lbrace);
  -                SimpleNode jjtn002 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTLBRACE);
  +      case ValidateContext:
  +        jj_consume_token(ValidateContext);
  +                SimpleNode jjtn002 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTVALIDATECONTEXT);
                   boolean jjtc002 = true;
                   jjtree.openNodeScope(jjtn002);
  -      try {
  +        try {
                   jjtree.closeNodeScope(jjtn002,  true);
                   jjtc002 = false;
                  jjtn002.processToken(token);
  -      } finally {
  +        } finally {
                   if (jjtc002) {
                     jjtree.closeNodeScope(jjtn002,  true);
                   }
  -      }
  -      Expr();
  -      jj_consume_token(Rbrace);
  -                SimpleNode jjtn003 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTRBRACE);
  +        }
  +        SchemaGlobalContext();
  +        label_16:
  +        while (true) {
  +          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  +          case Slash:
  +            ;
  +            break;
  +          default:
  +            jj_la1[43] = jj_gen;
  +            break label_16;
  +          }
  +          jj_consume_token(Slash);
  +                SimpleNode jjtn003 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTSLASH);
                   boolean jjtc003 = true;
                   jjtree.openNodeScope(jjtn003);
  -      try {
  +          try {
                   jjtree.closeNodeScope(jjtn003,  true);
                   jjtc003 = false;
                  jjtn003.processToken(token);
  -      } finally {
  +          } finally {
                   if (jjtc003) {
                     jjtree.closeNodeScope(jjtn003,  true);
                   }
  +          }
  +          SchemaContextStep();
  +        }
  +        jj_consume_token(LbraceExprEnclosure);
  +                SimpleNode jjtn004 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTLBRACEEXPRENCLOSURE);
  +                boolean jjtc004 = true;
  +                jjtree.openNodeScope(jjtn004);
  +        try {
  +                jjtree.closeNodeScope(jjtn004,  true);
  +                jjtc004 = false;
  +               jjtn004.processToken(token);
  +        } finally {
  +                if (jjtc004) {
  +                  jjtree.closeNodeScope(jjtn004,  true);
  +                }
  +        }
  +        break;
  +      default:
  +        jj_la1[44] = jj_gen;
  +        jj_consume_token(-1);
  +        throw new ParseException();
  +      }
  +      Expr();
  +      jj_consume_token(Rbrace);
  +                SimpleNode jjtn005 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTRBRACE);
  +                boolean jjtc005 = true;
  +                jjtree.openNodeScope(jjtn005);
  +      try {
  +                jjtree.closeNodeScope(jjtn005,  true);
  +                jjtc005 = false;
  +               jjtn005.processToken(token);
  +      } finally {
  +                if (jjtc005) {
  +                  jjtree.closeNodeScope(jjtn005,  true);
  +                }
         }
       } catch (Throwable jjte000) {
       if (jjtc000) {
  @@ -1986,41 +2148,60 @@
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);
       try {
  -      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  -      case CastAs:
  -        jj_consume_token(CastAs);
  +      jj_consume_token(CastAs);
                   SimpleNode jjtn001 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTCASTAS);
                   boolean jjtc001 = true;
                   jjtree.openNodeScope(jjtn001);
  -        try {
  +      try {
                   jjtree.closeNodeScope(jjtn001,  true);
                   jjtc001 = false;
                  jjtn001.processToken(token);
  -        } finally {
  +      } finally {
                   if (jjtc001) {
                     jjtree.closeNodeScope(jjtn001,  true);
                   }
  -        }
  -        break;
  -      case TreatAs:
  -        jj_consume_token(TreatAs);
  -                SimpleNode jjtn002 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTTREATAS);
  -                boolean jjtc002 = true;
  -                jjtree.openNodeScope(jjtn002);
  -        try {
  -                jjtree.closeNodeScope(jjtn002,  true);
  -                jjtc002 = false;
  -               jjtn002.processToken(token);
  -        } finally {
  -                if (jjtc002) {
  -                  jjtree.closeNodeScope(jjtn002,  true);
  +      }
  +      SingleType();
  +      ParenthesizedExpr();
  +    } catch (Throwable jjte000) {
  +    if (jjtc000) {
  +      jjtree.clearNodeScope(jjtn000);
  +      jjtc000 = false;
  +    } else {
  +      jjtree.popNode();
  +    }
  +    if (jjte000 instanceof RuntimeException) {
  +      {if (true) throw (RuntimeException)jjte000;}
  +    }
  +    if (jjte000 instanceof ParseException) {
  +      {if (true) throw (ParseException)jjte000;}
  +    }
  +    {if (true) throw (Error)jjte000;}
  +    } finally {
  +    if (jjtc000) {
  +      jjtree.closeNodeScope(jjtn000, true);
  +    }
  +    }
  +  }
  +
  +  final public void TreatExpr() throws ParseException {
  + /[EMAIL PROTECTED](jjtree) TreatExpr */
  +  SimpleNode jjtn000 = (SimpleNode)SimpleNode.jjtCreate(this, JJTTREATEXPR);
  +  boolean jjtc000 = true;
  +  jjtree.openNodeScope(jjtn000);
  +    try {
  +      jj_consume_token(TreatAs);
  +                SimpleNode jjtn001 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTTREATAS);
  +                boolean jjtc001 = true;
  +                jjtree.openNodeScope(jjtn001);
  +      try {
  +                jjtree.closeNodeScope(jjtn001,  true);
  +                jjtc001 = false;
  +               jjtn001.processToken(token);
  +      } finally {
  +                if (jjtc001) {
  +                  jjtree.closeNodeScope(jjtn001,  true);
                   }
  -        }
  -        break;
  -      default:
  -        jj_la1[42] = jj_gen;
  -        jj_consume_token(-1);
  -        throw new ParseException();
         }
         SequenceType();
         ParenthesizedExpr();
  @@ -2072,7 +2253,7 @@
             binaryTokenStack.push(token);
         break;
       default:
  -      jj_la1[43] = jj_gen;
  +      jj_la1[45] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
  @@ -2105,7 +2286,7 @@
             binaryTokenStack.push(token);
         break;
       default:
  -      jj_la1[44] = jj_gen;
  +      jj_la1[46] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
  @@ -2122,7 +2303,7 @@
             binaryTokenStack.push(token);
         break;
       default:
  -      jj_la1[45] = jj_gen;
  +      jj_la1[47] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
  @@ -2138,16 +2319,8 @@
         jj_consume_token(GtGt);
             binaryTokenStack.push(token);
         break;
  -    case Precedes:
  -      jj_consume_token(Precedes);
  -          binaryTokenStack.push(token);
  -      break;
  -    case Follows:
  -      jj_consume_token(Follows);
  -          binaryTokenStack.push(token);
  -      break;
       default:
  -      jj_la1[46] = jj_gen;
  +      jj_la1[48] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
  @@ -2184,7 +2357,7 @@
         ParenthesizedExpr();
         break;
       default:
  -      jj_la1[47] = jj_gen;
  +      jj_la1[49] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
  @@ -2313,7 +2486,7 @@
         }
         break;
       default:
  -      jj_la1[48] = jj_gen;
  +      jj_la1[50] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
  @@ -2397,7 +2570,7 @@
         }
         break;
       default:
  -      jj_la1[49] = jj_gen;
  +      jj_la1[51] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
  @@ -2423,7 +2596,7 @@
           NameTest();
           break;
         default:
  -        jj_la1[50] = jj_gen;
  +        jj_la1[52] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
  @@ -2476,7 +2649,7 @@
           Wildcard();
           break;
         default:
  -        jj_la1[51] = jj_gen;
  +        jj_la1[53] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
  @@ -2549,7 +2722,7 @@
         }
         break;
       default:
  -      jj_la1[52] = jj_gen;
  +      jj_la1[54] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
  @@ -2575,7 +2748,7 @@
           AnyKindTest();
           break;
         default:
  -        jj_la1[53] = jj_gen;
  +        jj_la1[55] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
  @@ -2624,7 +2797,7 @@
           }
           break;
         default:
  -        jj_la1[54] = jj_gen;
  +        jj_la1[56] = jj_gen;
           ;
         }
         jj_consume_token(Rpar);
  @@ -2706,7 +2879,7 @@
         AbbreviatedForwardStep();
         break;
       default:
  -      jj_la1[55] = jj_gen;
  +      jj_la1[57] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
  @@ -2726,7 +2899,7 @@
         AbbreviatedReverseStep();
         break;
       default:
  -      jj_la1[56] = jj_gen;
  +      jj_la1[58] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
  @@ -2781,7 +2954,7 @@
           NodeTest();
           break;
         default:
  -        jj_la1[57] = jj_gen;
  +        jj_la1[59] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
  @@ -2828,15 +3001,15 @@
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);
       try {
  -      label_18:
  +      label_17:
         while (true) {
           switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
           case Lbrack:
             ;
             break;
           default:
  -          jj_la1[58] = jj_gen;
  -          break label_18;
  +          jj_la1[60] = jj_gen;
  +          break label_17;
           }
           jj_consume_token(Lbrack);
                   SimpleNode jjtn001 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTLBRACK);
  @@ -2935,7 +3108,7 @@
         }
         break;
       default:
  -      jj_la1[59] = jj_gen;
  +      jj_la1[61] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
  @@ -2964,7 +3137,7 @@
         }
         break;
       default:
  -      jj_la1[60] = jj_gen;
  +      jj_la1[62] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
  @@ -2973,6 +3146,10 @@
     final public void ParenthesizedExpr() throws ParseException {
       jj_consume_token(Lpar);
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  +    case IntegerLiteral:
  +    case DecimalLiteral:
  +    case DoubleLiteral:
  +    case StringLiteral:
       case AxisChild:
       case AxisDescendant:
       case AxisParent:
  @@ -3000,16 +3177,13 @@
       case ForVariable:
       case CastAs:
       case TreatAs:
  -    case Validate:
  -    case IntegerLiteral:
  -    case DecimalLiteral:
  -    case DoubleLiteral:
  +    case ValidateLbrace:
  +    case ValidateContext:
       case NodeLpar:
       case CommentLpar:
       case TextLpar:
       case ProcessingInstructionLpar:
       case IfLpar:
  -    case StringLiteral:
       case Dot:
       case DotDot:
       case VariableIndicator:
  @@ -3018,7 +3192,7 @@
         ExprSequence();
         break;
       default:
  -      jj_la1[61] = jj_gen;
  +      jj_la1[63] = jj_gen;
         ;
       }
       jj_consume_token(Rpar);
  @@ -3044,6 +3218,10 @@
                   }
         }
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  +      case IntegerLiteral:
  +      case DecimalLiteral:
  +      case DoubleLiteral:
  +      case StringLiteral:
         case AxisChild:
         case AxisDescendant:
         case AxisParent:
  @@ -3071,38 +3249,35 @@
         case ForVariable:
         case CastAs:
         case TreatAs:
  -      case Validate:
  -      case IntegerLiteral:
  -      case DecimalLiteral:
  -      case DoubleLiteral:
  +      case ValidateLbrace:
  +      case ValidateContext:
         case NodeLpar:
         case CommentLpar:
         case TextLpar:
         case ProcessingInstructionLpar:
         case IfLpar:
  -      case StringLiteral:
         case Dot:
         case DotDot:
         case VariableIndicator:
         case QName:
         case QNameLpar:
           Expr();
  -        label_19:
  +        label_18:
           while (true) {
             switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
             case Comma:
               ;
               break;
             default:
  -            jj_la1[62] = jj_gen;
  -            break label_19;
  +            jj_la1[64] = jj_gen;
  +            break label_18;
             }
             jj_consume_token(Comma);
             Expr();
           }
           break;
         default:
  -        jj_la1[63] = jj_gen;
  +        jj_la1[65] = jj_gen;
           ;
         }
         jj_consume_token(Rpar);
  @@ -3133,8 +3308,8 @@
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);
       try {
  -      jj_consume_token(In);
  -                SimpleNode jjtn001 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTIN);
  +      jj_consume_token(InContext);
  +                SimpleNode jjtn001 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTINCONTEXT);
                   boolean jjtc001 = true;
                   jjtree.openNodeScope(jjtn001);
         try {
  @@ -3147,15 +3322,15 @@
                   }
         }
         SchemaGlobalContext();
  -      label_20:
  +      label_19:
         while (true) {
           switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
           case Slash:
             ;
             break;
           default:
  -          jj_la1[64] = jj_gen;
  -          break label_20;
  +          jj_la1[66] = jj_gen;
  +          break label_19;
           }
           jj_consume_token(Slash);
                   SimpleNode jjtn002 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTSLASH);
  @@ -3215,9 +3390,9 @@
                   }
           }
           break;
  -      case Type:
  -        jj_consume_token(Type);
  -                SimpleNode jjtn002 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTTYPE);
  +      case TypeQName:
  +        jj_consume_token(TypeQName);
  +                SimpleNode jjtn002 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTTYPEQNAME);
                   boolean jjtc002 = true;
                   jjtree.openNodeScope(jjtn002);
           try {
  @@ -3229,22 +3404,9 @@
                     jjtree.closeNodeScope(jjtn002,  true);
                   }
           }
  -        jj_consume_token(QName);
  -                SimpleNode jjtn003 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTQNAME);
  -                boolean jjtc003 = true;
  -                jjtree.openNodeScope(jjtn003);
  -        try {
  -                jjtree.closeNodeScope(jjtn003,  true);
  -                jjtc003 = false;
  -               jjtn003.processToken(token);
  -        } finally {
  -                if (jjtc003) {
  -                  jjtree.closeNodeScope(jjtn003,  true);
  -                }
  -        }
           break;
         default:
  -        jj_la1[65] = jj_gen;
  +        jj_la1[67] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
  @@ -3281,6 +3443,54 @@
       }
     }
   
  +  final public void SingleType() throws ParseException {
  + /[EMAIL PROTECTED](jjtree) SingleType */
  +  SimpleNode jjtn000 = (SimpleNode)SimpleNode.jjtCreate(this, JJTSINGLETYPE);
  +  boolean jjtc000 = true;
  +  jjtree.openNodeScope(jjtn000);
  +    try {
  +      AtomicType();
  +      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  +      case QMark:
  +        jj_consume_token(QMark);
  +                SimpleNode jjtn001 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTQMARK);
  +                boolean jjtc001 = true;
  +                jjtree.openNodeScope(jjtn001);
  +        try {
  +                jjtree.closeNodeScope(jjtn001,  true);
  +                jjtc001 = false;
  +               jjtn001.processToken(token);
  +        } finally {
  +                if (jjtc001) {
  +                  jjtree.closeNodeScope(jjtn001,  true);
  +                }
  +        }
  +        break;
  +      default:
  +        jj_la1[68] = jj_gen;
  +        ;
  +      }
  +    } catch (Throwable jjte000) {
  +    if (jjtc000) {
  +      jjtree.clearNodeScope(jjtn000);
  +      jjtc000 = false;
  +    } else {
  +      jjtree.popNode();
  +    }
  +    if (jjte000 instanceof RuntimeException) {
  +      {if (true) throw (RuntimeException)jjte000;}
  +    }
  +    if (jjte000 instanceof ParseException) {
  +      {if (true) throw (ParseException)jjte000;}
  +    }
  +    {if (true) throw (Error)jjte000;}
  +    } finally {
  +    if (jjtc000) {
  +      jjtree.closeNodeScope(jjtn000, true);
  +    }
  +    }
  +  }
  +
     final public void SequenceType() throws ParseException {
    /[EMAIL PROTECTED](jjtree) SequenceType */
     SimpleNode jjtn000 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTSEQUENCETYPE);
  @@ -3318,7 +3528,7 @@
           }
           break;
         default:
  -        jj_la1[66] = jj_gen;
  +        jj_la1[69] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
  @@ -3384,7 +3594,7 @@
             }
             break;
           default:
  -          jj_la1[67] = jj_gen;
  +          jj_la1[70] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
  @@ -3394,7 +3604,7 @@
             ElemOrAttrType();
             break;
           default:
  -          jj_la1[68] = jj_gen;
  +          jj_la1[71] = jj_gen;
             ;
           }
           break;
  @@ -3522,7 +3732,7 @@
           }
           break;
         default:
  -        jj_la1[69] = jj_gen;
  +        jj_la1[72] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
  @@ -3573,13 +3783,13 @@
             SchemaType();
             break;
           default:
  -          jj_la1[71] = jj_gen;
  +          jj_la1[74] = jj_gen;
             switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  -          case In:
  +          case InContext:
               SchemaContext();
               break;
             default:
  -            jj_la1[70] = jj_gen;
  +            jj_la1[73] = jj_gen;
               ;
             }
           }
  @@ -3588,7 +3798,7 @@
           SchemaType();
           break;
         default:
  -        jj_la1[72] = jj_gen;
  +        jj_la1[75] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
  @@ -3686,12 +3896,13 @@
       try {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case Multiply:
  +      case Star:
         case Plus:
         case QMark:
           switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  -        case Multiply:
  -          jj_consume_token(Multiply);
  -                SimpleNode jjtn001 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTMULTIPLY);
  +        case Star:
  +          jj_consume_token(Star);
  +                SimpleNode jjtn001 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTSTAR);
                   boolean jjtc001 = true;
                   jjtree.openNodeScope(jjtn001);
             try {
  @@ -3704,9 +3915,9 @@
                   }
             }
             break;
  -        case Plus:
  -          jj_consume_token(Plus);
  -                SimpleNode jjtn002 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTPLUS);
  +        case Multiply:
  +          jj_consume_token(Multiply);
  +                SimpleNode jjtn002 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTMULTIPLY);
                   boolean jjtc002 = true;
                   jjtree.openNodeScope(jjtn002);
             try {
  @@ -3719,9 +3930,9 @@
                   }
             }
             break;
  -        case QMark:
  -          jj_consume_token(QMark);
  -                SimpleNode jjtn003 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTQMARK);
  +        case Plus:
  +          jj_consume_token(Plus);
  +                SimpleNode jjtn003 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTPLUS);
                   boolean jjtc003 = true;
                   jjtree.openNodeScope(jjtn003);
             try {
  @@ -3734,14 +3945,29 @@
                   }
             }
             break;
  +        case QMark:
  +          jj_consume_token(QMark);
  +                SimpleNode jjtn004 = (SimpleNode)SimpleNode.jjtCreate(this, 
JJTQMARK);
  +                boolean jjtc004 = true;
  +                jjtree.openNodeScope(jjtn004);
  +          try {
  +                jjtree.closeNodeScope(jjtn004,  true);
  +                jjtc004 = false;
  +               jjtn004.processToken(token);
  +          } finally {
  +                if (jjtc004) {
  +                  jjtree.closeNodeScope(jjtn004,  true);
  +                }
  +          }
  +          break;
           default:
  -          jj_la1[73] = jj_gen;
  +          jj_la1[76] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
           break;
         default:
  -        jj_la1[74] = jj_gen;
  +        jj_la1[77] = jj_gen;
           ;
         }
       } finally {
  @@ -3756,12 +3982,12 @@
     public Token token, jj_nt;
     private int jj_ntk;
     private int jj_gen;
  -  final private int[] jj_la1 = new int[75];
  -  final private int[] jj_la1_0 = 
{0x0,0x80000000,0x80000000,0x120,0x0,0x0,0x120,0x0,0x0,0x120,0x120,0x0,0x0,0x40000,0x80000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000000,0x0,0x0,0xf00000,0xf00000,0x80000000,0x80000000,0x40000000,0x40000000,0x0,0x0,0x3ffe0,0x3ffe0,0x3ffe0,0x0,0x0,0x3ffe0,0x0,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x15760,0x2a880,0x0,0x0,0x0,0x0,0x0,0x15760,0x2a880,0x0,0x0,0x0,0x0,0x3ffe0,0x0,0x3ffe0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x800000,0x800000,};
  -  final private int[] jj_la1_1 = 
{0x0,0x0,0x0,0x700000,0x6000000,0x6000000,0x1f00000,0x6000000,0x6000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0xf8000006,0xf8000006,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x0,0x0,0x1f00000,0x700000,0x1f00000,0x6000000,0x6000000,0x700000,0x0,0x0,0x0,0xa8000000,0x0,0x50000000,0x6,0x0,0x0,0x0,0x700000,0x700000,0x700000,0x0,0x0,0x700000,0x0,0x700000,0x0,0x0,0x0,0x1f00000,0x0,0x1f00000,0x2000000,0x8000,0x34070,0x60,0x2000,0x14070,0x0,0x2000,0x2000,0x0,0x0,};
  -  final private int[] jj_la1_2 = 
{0x0,0x4000,0x4000,0x10000,0x0,0x0,0x10000,0x0,0x0,0x10000,0x10000,0x0,0x38000000,0x0,0x0,0x400000,0x300000,0x300000,0x0,0x0,0x0,0x7ff,0x7ff,0x0,0x1800,0x1800,0x0,0x0,0x4000,0x4000,0x0,0x0,0x1800,0x1800,0x3b818000,0x38018000,0x38018000,0x0,0x0,0x38018000,0x0,0x0,0x1800000,0x602,0x1f8,0x0,0x5,0x38008000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x0,0x10000,0x20000,0x38000000,0x38000000,0x3bf19800,0x0,0x3bf19800,0x0,0x0,0xc0000000,0x0,0x0,0xc0000000,0x0,0x0,0x0,0x3000,0x3000,};
  -  final private int[] jj_la1_3 = 
{0x200,0x0,0x0,0x800f0,0x0,0x0,0x4800f0,0x0,0x0,0x0,0x0,0x200,0x20400,0x0,0x0,0x0,0x0,0x0,0x200,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4a34f0,0x4a34f0,0x4a34f0,0x0,0x0,0x4a34f0,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x420400,0x0,0x0,0x800f0,0x80000,0x0,0xf0,0x400,0x810f0,0x2000,0x810f0,0x0,0x0,0x400,0x4a35f0,0x200,0x4a35f0,0x0,0x80000,0x8000e,0x0,0x80000,0x8000e,0x0,0x0,0x80000,0x0,0x0,};
  -  final private int[] jj_la1_4 = 
{0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
  +  final private int[] jj_la1 = new int[78];
  +  final private int[] jj_la1_0 = 
{0x3ffe1e,0x0,0x0,0x0,0x1200,0x0,0x0,0x1200,0x0,0x0,0x1200,0x1200,0x0,0x10,0x400000,0x800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xf000000,0xf000000,0x0,0x0,0x0,0x0,0x0,0x0,0x3ffe1e,0x3ffe1e,0x3ffe1e,0x0,0x0,0x3ffe1e,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1e,0x157600,0x2a8800,0x0,0x0,0x0,0x0,0x10,0x157600,0x2a8800,0x0,0x0,0xe,0x1e,0x3ffe1e,0x0,0x3ffe1e,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000000,0x0,0x0,0x8000000,0x8000000,};
  +  final private int[] jj_la1_1 = 
{0x3e000000,0x0,0x10,0x10,0xe000000,0xc0000000,0xc0000000,0x3e000000,0xc0000000,0xc0000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x80,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x10,0x28,0x28,0x3e000000,0xe000000,0x3e000000,0xc0000000,0xc0000000,0xe000000,0x0,0x40000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xe000000,0xe000000,0xe000000,0x0,0x0,0xe000000,0x0,0xe000000,0x0,0x0,0x0,0x3e000000,0x0,0x3e000000,0x40000000,0x100000,0x0,0x680700,0x600,0x40000,0x280700,0x0,0x40000,0x40000,0x2000000,0x2000000,};
  +  final private int[] jj_la1_2 = 
{0xfe330000,0x0,0x80000,0x80000,0x200000,0x0,0x0,0x200000,0x0,0x0,0x200000,0x200000,0x0,0x0,0x0,0x0,0x8000000,0x6000000,0x6000000,0x0,0x0,0x0,0x0,0xffff,0xffff,0x0,0x30000,0x30000,0x0,0x0,0x30000,0x30000,0x80000,0x80000,0x0,0x0,0xf0300000,0x300000,0x300000,0x0,0x0,0x300000,0x0,0x0,0xc0000000,0xc055,0x3f00,0xa,0xa0,0x100000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200000,0x0,0x200000,0x400000,0x0,0x0,0xfe330000,0x0,0xfe330000,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x60000,0x60000,};
  +  final private int[] jj_la1_3 = 
{0x346f80,0x1000,0x0,0x0,0x100780,0x0,0x0,0x300780,0x0,0x0,0x0,0x0,0x1000,0x40000,0x0,0x0,0x0,0x0,0x0,0x1000,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x346780,0x346780,0x346780,0x0,0x0,0x346780,0x1000,0x0,0x0,0x0,0x0,0x0,0x0,0x240000,0x0,0x0,0x100780,0x100000,0x0,0x780,0x0,0x102780,0x4000,0x102780,0x0,0x0,0x0,0x346f80,0x1000,0x346f80,0x0,0x100000,0x0,0x100076,0x0,0x100000,0x100076,0x0,0x0,0x100000,0x0,0x0,};
  +  final private int[] jj_la1_4 = 
{0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
   
     public XPath(java.io.InputStream stream) {
       jj_input_stream = new ASCII_CharStream(stream, 1, 1);
  @@ -3769,7 +3995,7 @@
       token = new Token();
       jj_ntk = -1;
       jj_gen = 0;
  -    for (int i = 0; i < 75; i++) jj_la1[i] = -1;
  +    for (int i = 0; i < 78; i++) jj_la1[i] = -1;
     }
   
     public void ReInit(java.io.InputStream stream) {
  @@ -3779,7 +4005,7 @@
       jj_ntk = -1;
       jjtree.reset();
       jj_gen = 0;
  -    for (int i = 0; i < 75; i++) jj_la1[i] = -1;
  +    for (int i = 0; i < 78; i++) jj_la1[i] = -1;
     }
   
     public XPath(java.io.Reader stream) {
  @@ -3788,7 +4014,7 @@
       token = new Token();
       jj_ntk = -1;
       jj_gen = 0;
  -    for (int i = 0; i < 75; i++) jj_la1[i] = -1;
  +    for (int i = 0; i < 78; i++) jj_la1[i] = -1;
     }
   
     public void ReInit(java.io.Reader stream) {
  @@ -3798,7 +4024,7 @@
       jj_ntk = -1;
       jjtree.reset();
       jj_gen = 0;
  -    for (int i = 0; i < 75; i++) jj_la1[i] = -1;
  +    for (int i = 0; i < 78; i++) jj_la1[i] = -1;
     }
   
     public XPath(XPathTokenManager tm) {
  @@ -3806,7 +4032,7 @@
       token = new Token();
       jj_ntk = -1;
       jj_gen = 0;
  -    for (int i = 0; i < 75; i++) jj_la1[i] = -1;
  +    for (int i = 0; i < 78; i++) jj_la1[i] = -1;
     }
   
     public void ReInit(XPathTokenManager tm) {
  @@ -3815,7 +4041,7 @@
       jj_ntk = -1;
       jjtree.reset();
       jj_gen = 0;
  -    for (int i = 0; i < 75; i++) jj_la1[i] = -1;
  +    for (int i = 0; i < 78; i++) jj_la1[i] = -1;
     }
   
     final private Token jj_consume_token(int kind) throws ParseException {
  @@ -3870,7 +4096,7 @@
         la1tokens[jj_kind] = true;
         jj_kind = -1;
       }
  -    for (int i = 0; i < 75; i++) {
  +    for (int i = 0; i < 78; i++) {
         if (jj_la1[i] == jj_gen) {
           for (int j = 0; j < 32; j++) {
             if ((jj_la1_0[i] & (1<<j)) != 0) {
  
  
  
  1.1.2.1.2.1 +140 -141  
xml-xalan/java/src/org/apache/xpath/parser/Attic/XPathConstants.java
  
  Index: XPathConstants.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xpath/parser/Attic/XPathConstants.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.1.2.1
  diff -u -r1.1.2.1 -r1.1.2.1.2.1
  --- XPathConstants.java       14 Aug 2002 20:07:07 -0000      1.1.2.1
  +++ XPathConstants.java       13 Nov 2002 05:27:34 -0000      1.1.2.1.2.1
  @@ -4,124 +4,124 @@
   public interface XPathConstants {
   
     int EOF = 0;
  -  int ExprComment = 1;
  -  int skip_ = 3;
  -  int S = 4;
  -  int AxisChild = 5;
  -  int AxisDescendant = 6;
  -  int AxisParent = 7;
  -  int AxisAttribute = 8;
  -  int AxisSelf = 9;
  -  int AxisDescendantOrSelf = 10;
  -  int AxisAncestor = 11;
  -  int AxisFollowingSibling = 12;
  -  int AxisPrecedingSibling = 13;
  -  int AxisFollowing = 14;
  -  int AxisPreceding = 15;
  -  int AxisNamespace = 16;
  -  int AxisAncestorOrSelf = 17;
  -  int Or = 18;
  -  int And = 19;
  -  int Div = 20;
  -  int Idiv = 21;
  -  int Mod = 22;
  -  int Multiply = 23;
  -  int In = 24;
  -  int Satisfies = 25;
  -  int Return = 26;
  -  int Then = 27;
  -  int Else = 28;
  -  int To = 29;
  -  int Intersect = 30;
  -  int Union = 31;
  -  int Except = 32;
  -  int Precedes = 33;
  -  int Follows = 34;
  -  int Instanceof = 35;
  -  int Item = 36;
  -  int ElementType = 37;
  -  int AttributeType = 38;
  -  int ElementQNameLbrace = 39;
  -  int AttributeQNameLbrace = 40;
  -  int ElementLbrace = 41;
  -  int AttributeLbrace = 42;
  -  int DefaultElement = 43;
  -  int DefaultFunction = 44;
  -  int OfType = 45;
  -  int AtomicValue = 46;
  -  int Type = 47;
  -  int Node = 48;
  -  int Empty = 49;
  -  int Nmstart = 50;
  -  int Nmchar = 51;
  -  int Star = 52;
  -  int NCNameColonStar = 53;
  -  int StarColonNCName = 54;
  -  int Root = 55;
  -  int RootDescendants = 56;
  -  int Slash = 57;
  -  int SlashSlash = 58;
  -  int Equals = 59;
  -  int Is = 60;
  -  int NotEquals = 61;
  -  int IsNot = 62;
  -  int LtEquals = 63;
  -  int LtLt = 64;
  -  int GtEquals = 65;
  -  int GtGt = 66;
  -  int FortranEq = 67;
  -  int FortranNe = 68;
  -  int FortranGt = 69;
  -  int FortranGe = 70;
  -  int FortranLt = 71;
  -  int FortranLe = 72;
  -  int Lt = 73;
  -  int Gt = 74;
  -  int Minus = 75;
  -  int Plus = 76;
  -  int QMark = 77;
  -  int Vbar = 78;
  -  int Lpar = 79;
  -  int At = 80;
  -  int Lbrack = 81;
  -  int Rbrack = 82;
  -  int Rpar = 83;
  -  int Some = 84;
  -  int Every = 85;
  -  int ForVariable = 86;
  -  int CastAs = 87;
  -  int TreatAs = 88;
  -  int Validate = 89;
  -  int Digits = 90;
  -  int IntegerLiteral = 91;
  -  int DecimalLiteral = 92;
  -  int DoubleLiteral = 93;
  -  int Comment = 94;
  -  int Document = 95;
  -  int DocumentLbrace = 96;
  -  int Text = 97;
  -  int Untyped = 98;
  -  int ProcessingInstruction = 99;
  -  int NodeLpar = 100;
  -  int CommentLpar = 101;
  -  int TextLpar = 102;
  -  int ProcessingInstructionLpar = 103;
  -  int IfLpar = 104;
  -  int Comma = 105;
  -  int StringLiteral = 106;
  -  int NamespaceURLLiteral = 107;
  -  int Dot = 108;
  -  int DotDot = 109;
  -  int NCName = 110;
  -  int Prefix = 111;
  -  int LocalPart = 112;
  -  int VariableIndicator = 113;
  -  int VarName = 114;
  -  int QName = 115;
  -  int FuncName = 116;
  -  int FuncPListOpen = 117;
  -  int QNameLpar = 118;
  -  int Lbrace = 119;
  +  int IntegerLiteral = 1;
  +  int DecimalLiteral = 2;
  +  int DoubleLiteral = 3;
  +  int StringLiteral = 4;
  +  int ExprComment = 5;
  +  int skip_ = 7;
  +  int S = 8;
  +  int AxisChild = 9;
  +  int AxisDescendant = 10;
  +  int AxisParent = 11;
  +  int AxisAttribute = 12;
  +  int AxisSelf = 13;
  +  int AxisDescendantOrSelf = 14;
  +  int AxisAncestor = 15;
  +  int AxisFollowingSibling = 16;
  +  int AxisPrecedingSibling = 17;
  +  int AxisFollowing = 18;
  +  int AxisPreceding = 19;
  +  int AxisNamespace = 20;
  +  int AxisAncestorOrSelf = 21;
  +  int Or = 22;
  +  int And = 23;
  +  int Div = 24;
  +  int Idiv = 25;
  +  int Mod = 26;
  +  int Multiply = 27;
  +  int In = 28;
  +  int InContext = 29;
  +  int Satisfies = 30;
  +  int Return = 31;
  +  int Then = 32;
  +  int Else = 33;
  +  int To = 34;
  +  int Intersect = 35;
  +  int Union = 36;
  +  int Except = 37;
  +  int Instanceof = 38;
  +  int Castable = 39;
  +  int Item = 40;
  +  int ElementType = 41;
  +  int AttributeType = 42;
  +  int ElementQNameLbrace = 43;
  +  int AttributeQNameLbrace = 44;
  +  int ElementLbrace = 45;
  +  int AttributeLbrace = 46;
  +  int DefaultCollationEquals = 47;
  +  int DefaultElement = 48;
  +  int DefaultFunction = 49;
  +  int OfType = 50;
  +  int AtomicValue = 51;
  +  int TypeQName = 52;
  +  int Node = 53;
  +  int Empty = 54;
  +  int Nmstart = 55;
  +  int Nmchar = 56;
  +  int Star = 57;
  +  int NCNameColonStar = 58;
  +  int StarColonNCName = 59;
  +  int Root = 60;
  +  int RootDescendants = 61;
  +  int Slash = 62;
  +  int SlashSlash = 63;
  +  int Equals = 64;
  +  int Is = 65;
  +  int NotEquals = 66;
  +  int IsNot = 67;
  +  int LtEquals = 68;
  +  int LtLt = 69;
  +  int GtEquals = 70;
  +  int GtGt = 71;
  +  int FortranEq = 72;
  +  int FortranNe = 73;
  +  int FortranGt = 74;
  +  int FortranGe = 75;
  +  int FortranLt = 76;
  +  int FortranLe = 77;
  +  int Lt = 78;
  +  int Gt = 79;
  +  int Minus = 80;
  +  int Plus = 81;
  +  int QMark = 82;
  +  int Vbar = 83;
  +  int Lpar = 84;
  +  int At = 85;
  +  int Lbrack = 86;
  +  int Rbrack = 87;
  +  int Rpar = 88;
  +  int Some = 89;
  +  int Every = 90;
  +  int ForVariable = 91;
  +  int CastAs = 92;
  +  int TreatAs = 93;
  +  int ValidateLbrace = 94;
  +  int ValidateContext = 95;
  +  int Digits = 96;
  +  int Comment = 97;
  +  int Document = 98;
  +  int DocumentLbrace = 99;
  +  int Text = 100;
  +  int Untyped = 101;
  +  int ProcessingInstruction = 102;
  +  int NodeLpar = 103;
  +  int CommentLpar = 104;
  +  int TextLpar = 105;
  +  int ProcessingInstructionLpar = 106;
  +  int IfLpar = 107;
  +  int Comma = 108;
  +  int Dot = 109;
  +  int DotDot = 110;
  +  int NCName = 111;
  +  int Prefix = 112;
  +  int LocalPart = 113;
  +  int VariableIndicator = 114;
  +  int VarName = 115;
  +  int QName = 116;
  +  int QNameLpar = 117;
  +  int Lbrace = 118;
  +  int LbraceExprEnclosure = 119;
     int Rbrace = 120;
     int Char = 121;
     int WhitespaceChar = 122;
  @@ -133,28 +133,31 @@
     int Extender = 128;
   
     int DEFAULT = 0;
  -  int ELEMENT_CONTENT = 1;
  -  int OPERATOR = 2;
  +  int OPERATOR = 1;
  +  int NAMESPACEKEYWORD = 2;
     int QNAME = 3;
     int NAMESPACEDECL = 4;
     int XMLSPACE_DECL = 5;
     int ITEMTYPE = 6;
  -  int FUNCDEF = 7;
  -  int NAMESPACEKEYWORD = 8;
  +  int VARNAME = 7;
  +  int ELEMENT_CONTENT = 8;
     int START_TAG = 9;
     int END_TAG = 10;
  -  int VARNAME = 11;
  -  int QUOT_ATTRIBUTE_CONTENT = 12;
  -  int APOS_ATTRIBUTE_CONTENT = 13;
  -  int CDATA_SECTION = 14;
  -  int PROCESSING_INSTRUCTION = 15;
  -  int XML_COMMENT = 16;
  -  int XQUERY_COMMENT = 17;
  +  int QUOT_ATTRIBUTE_CONTENT = 11;
  +  int APOS_ATTRIBUTE_CONTENT = 12;
  +  int CDATA_SECTION = 13;
  +  int PROCESSING_INSTRUCTION_CONTENT = 14;
  +  int XML_COMMENT = 15;
  +  int XQUERY_COMMENT = 16;
   
     String[] tokenImage = {
       "<EOF>",
  +    "<IntegerLiteral>",
  +    "<DecimalLiteral>",
  +    "<DoubleLiteral>",
  +    "<StringLiteral>",
       "<ExprComment>",
  -    "<token of kind 2>",
  +    "<token of kind 6>",
       "<skip_>",
       "<S>",
       "<AxisChild>",
  @@ -177,6 +180,7 @@
       "\"mod\"",
       "\"*\"",
       "\"in\"",
  +    "\"context\"",
       "\"satisfies\"",
       "\"return\"",
       "\"then\"",
  @@ -185,9 +189,8 @@
       "\"intersect\"",
       "\"union\"",
       "\"except\"",
  -    "\"precedes\"",
  -    "\"follows\"",
       "<Instanceof>",
  +    "<Castable>",
       "\"item\"",
       "\"element\"",
       "\"attribute\"",
  @@ -195,11 +198,12 @@
       "<AttributeQNameLbrace>",
       "<ElementLbrace>",
       "<AttributeLbrace>",
  +    "<DefaultCollationEquals>",
       "<DefaultElement>",
       "<DefaultFunction>",
       "<OfType>",
       "<AtomicValue>",
  -    "\"type\"",
  +    "<TypeQName>",
       "\"node\"",
       "\"empty\"",
       "<Nmstart>",
  @@ -241,11 +245,9 @@
       "<ForVariable>",
       "<CastAs>",
       "<TreatAs>",
  -    "\"validate\"",
  +    "<ValidateLbrace>",
  +    "<ValidateContext>",
       "<Digits>",
  -    "<IntegerLiteral>",
  -    "<DecimalLiteral>",
  -    "<DoubleLiteral>",
       "\"comment\"",
       "\"document\"",
       "<DocumentLbrace>",
  @@ -258,8 +260,6 @@
       "<ProcessingInstructionLpar>",
       "<IfLpar>",
       "\",\"",
  -    "<StringLiteral>",
  -    "<NamespaceURLLiteral>",
       "\".\"",
       "\"..\"",
       "<NCName>",
  @@ -268,9 +268,8 @@
       "\"$\"",
       "<VarName>",
       "<QName>",
  -    "<FuncName>",
  -    "\"(\"",
       "<QNameLpar>",
  +    "\"{\"",
       "\"{\"",
       "\"}\"",
       "<Char>",
  
  
  
  1.1.2.1.2.1 +8709 
-5619xml-xalan/java/src/org/apache/xpath/parser/Attic/XPathTokenManager.java
  
  Index: XPathTokenManager.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xpath/parser/Attic/XPathTokenManager.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.1.2.1
  diff -u -r1.1.2.1 -r1.1.2.1.2.1
  --- XPathTokenManager.java    14 Aug 2002 20:07:07 -0000      1.1.2.1
  +++ XPathTokenManager.java    13 Nov 2002 05:27:34 -0000      1.1.2.1.2.1
  @@ -1,38 +1,143 @@
   /* Generated By:JJTree&JavaCC: Do not edit this line. XPathTokenManager.java 
*/
   package org.apache.xpath.parser;
  -
   import java.util.Stack;
   
  -
   public class XPathTokenManager implements XPathConstants
   {
  -  private java.util.Vector stateStack = new java.util.Vector();
  -  private void pushState() {
  +  private Stack stateStack = new Stack();
  +  static final int PARENMARKER = 2000;
  +
  +  /**
  +   * Push the current state onto the state stack.
  +   */
  +  private void pushState()
  +  {
       stateStack.addElement(new Integer(curLexState));
     }
  -  private void pushState(int state) {
  -    stateStack.addElement(new Integer(state));
  +
  +  /**
  +   * Push the given state onto the state stack.
  +   * @param state Must be a valid state.
  +   */
  +  private void pushState(int state)
  +  {
  +    stateStack.push(new Integer(state));
     }
  -  private void popState() {
  -    if(stateStack.size() == 0)
  +
  +  /**
  +   * Pop the state on the state stack, and switch to that state.
  +   */
  +  private void popState()
  +  {
  +    if (stateStack.size() == 0)
       {
         printLinePos();
       }
   
  -    int nextState = ((Integer)stateStack.lastElement()).intValue();
  -
  -    stateStack.setSize(stateStack.size() - 1);
  +    int nextState = ((Integer) stateStack.pop()).intValue();
  +    if(nextState == PARENMARKER)
  +      printLinePos();
       SwitchTo(nextState);
     }
   
  -  public void printLinePos()
  +  /**
  +   * Push a parenthesis state.  This pushes, in addition to the 
  +   * lexical state value, a special marker that lets 
  +   * resetParenStateOrSwitch(int state)
  +   * know if it should pop and switch.  Used for the comma operator.
  +   */
  +  private void pushParenState(int commaState, int rparState)
     {
  -    System.err.println("Line: "+input_stream.getEndLine());
  +    stateStack.push(new Integer(rparState));
  +    stateStack.push(new Integer(commaState));
  +    stateStack.push(new Integer(PARENMARKER));
  +    SwitchTo(commaState);
     }
   
  -private final int jjMoveStringLiteralDfa0_15()
  +
  +//  /**
  +//   * Push a parenthesis state.  This pushes, in addition to the 
  +//   * lexical state value, a special marker that lets 
  +//   * resetParenStateOrSwitch(int state)
  +//   * know if it should pop and switch.  Used for the comma operator.
  +//   */
  +//  private void pushParenState()
  +//  {
  +//    stateStack.push(new Integer(curLexState));
  +//    stateStack.push(new Integer(PARENMARKER));
  +//  }
  +
  +  /**
  +   * If a PARENMARKER is on the stack, switch the state to 
  +   * the state underneath the marker.  Leave the stack in 
  +   * the same state.  If the stack is zero, do nothing.
  +   * @param state The state to switch to if the PARENMARKER is not found.
  +   */
  +  private void resetParenStateOrSwitch(int state)
  +  {
  +    if (stateStack.size() == 0)
  +    {
  +      SwitchTo(state);
  +      return;
  +    }
  +
  +    int nextState = ((Integer) stateStack.peek()).intValue();
  +    if (PARENMARKER == nextState)
  +    {
  +      // Wait for right paren to do the pop!
  +      Integer intObj = (Integer) stateStack.elementAt(stateStack.size() - 2);
  +      nextState = intObj.intValue();
  +      SwitchTo(nextState);
  +    }
  +    else
  +      SwitchTo(state);
  +  }
  +
  +//   /**
  +//    * Pop the lexical state stack two elements.
  +//    */
  +// private void popParenState()
  +//   {
  +//     if (stateStack.size() == 0)
  +//       return;
  +// 
  +//     int nextState = ((Integer) stateStack.peek()).intValue();
  +//     if (PARENMARKER == nextState)
  +//     {
  +//       stateStack.pop();
  +//       stateStack.pop();
  +//     }
  +//   }
  +
  +  /**
  +   * Pop the lexical state stack two elements.
  +   */
  +  private void popParenState()
  +  {
  +    if (stateStack.size() == 0)
  +      return;
  +
  +    int nextState = ((Integer) stateStack.peek()).intValue();
  +    if (PARENMARKER == nextState)
  +    {
  +      stateStack.pop();
  +      stateStack.pop();
  +      int rparState = ((Integer) stateStack.peek()).intValue();
  +      SwitchTo(rparState);
  +      stateStack.pop();
  +    }
  +  }
  +
  +  /**
  +   * Print the current line position.
  +   */
  +  public void printLinePos()
  +  {
  +    System.err.println("Line: " + input_stream.getEndLine());
  +  }
  +private final int jjMoveStringLiteralDfa0_5()
   {
  -   return jjMoveNfa_15(0, 0);
  +   return jjMoveNfa_5(8, 0);
   }
   private final void jjCheckNAdd(int state)
   {
  @@ -65,19 +170,13 @@
      jjCheckNAdd(jjnextStates[start + 1]);
   }
   static final long[] jjbitVec0 = {
  -   0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 
0x7fffffffffffffffL
  -};
  -static final long[] jjbitVec2 = {
      0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL
   };
  -static final long[] jjbitVec3 = {
  -   0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL, 
0x3fffffffffffffffL
  -};
  -private final int jjMoveNfa_15(int startState, int curPos)
  +private final int jjMoveNfa_5(int startState, int curPos)
   {
      int[] nextStates;
      int startsAt = 0;
  -   jjnewStateCnt = 1;
  +   jjnewStateCnt = 15;
      int i = 1;
      jjstateSet[0] = startState;
      int j, kind = 0x7fffffff;
  @@ -92,9 +191,51 @@
            {
               switch(jjstateSet[--i])
               {
  +               case 8:
                  case 0:
  -                  if ((0xffffffff00002600L & l) != 0L)
  -                     kind = 121;
  +                  if ((0x100002600L & l) == 0L)
  +                     break;
  +                  if (kind > 6)
  +                     kind = 6;
  +                  jjCheckNAddTwoStates(0, 5);
  +                  break;
  +               case 1:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(2, 7);
  +                  break;
  +               case 2:
  +                  jjCheckNAddTwoStates(2, 7);
  +                  break;
  +               case 4:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 1;
  +                  break;
  +               case 6:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 3;
  +                  break;
  +               case 7:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 6;
  +                  break;
  +               case 9:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(10, 13);
  +                  break;
  +               case 10:
  +                  jjCheckNAddTwoStates(10, 13);
  +                  break;
  +               case 12:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 11;
  +                  break;
  +               case 13:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 12;
  +                  break;
  +               case 14:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 9;
                     break;
                  default : break;
               }
  @@ -107,8 +248,32 @@
            {
               switch(jjstateSet[--i])
               {
  -               case 0:
  -                  kind = 121;
  +               case 8:
  +                  if (curChar == 123)
  +                     jjCheckNAddTwoStates(14, 4);
  +                  break;
  +               case 2:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(0, 1);
  +                  break;
  +               case 3:
  +                  if (curChar != 125)
  +                     break;
  +                  if (kind > 6)
  +                     kind = 6;
  +                  jjAddStates(2, 3);
  +                  break;
  +               case 5:
  +                  if (curChar == 123)
  +                     jjCheckNAdd(4);
  +                  break;
  +               case 10:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(4, 5);
  +                  break;
  +               case 11:
  +                  if (curChar == 125 && kind > 5)
  +                     kind = 5;
                     break;
                  default : break;
               }
  @@ -122,9 +287,13 @@
            {
               switch(jjstateSet[--i])
               {
  -               case 0:
  -                  if ((jjbitVec2[i2] & l2) != 0L && kind > 121)
  -                     kind = 121;
  +               case 2:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(0, 1);
  +                  break;
  +               case 10:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(4, 5);
                     break;
                  default : break;
               }
  @@ -137,7 +306,7 @@
            kind = 0x7fffffff;
         }
         ++curPos;
  -      if ((i = jjnewStateCnt) == (startsAt = 1 - (jjnewStateCnt = startsAt)))
  +      if ((i = jjnewStateCnt) == (startsAt = 15 - (jjnewStateCnt = 
startsAt)))
            return curPos;
         try { curChar = input_stream.readChar(); }
         catch(java.io.IOException e) { return curPos; }
  @@ -174,7 +343,7 @@
      switch(curChar)
      {
         case 123:
  -         return jjStopAtPos(0, 119);
  +         return jjStopAtPos(0, 118);
         default :
            return jjMoveNfa_10(0, 0);
      }
  @@ -201,7 +370,7 @@
                  case 0:
                     if ((0x100002600L & l) == 0L)
                        break;
  -                  kind = 4;
  +                  kind = 8;
                     jjstateSet[jjnewStateCnt++] = 0;
                     break;
                  default : break;
  @@ -244,11 +413,43 @@
         catch(java.io.IOException e) { return curPos; }
      }
   }
  -private final int jjMoveStringLiteralDfa0_16()
  +private final int jjStopStringLiteralDfa_12(int pos, long active0, long 
active1)
   {
  -   return jjMoveNfa_16(0, 0);
  +   switch (pos)
  +   {
  +      default :
  +         return -1;
  +   }
   }
  -private final int jjMoveNfa_16(int startState, int curPos)
  +private final int jjStartNfa_12(int pos, long active0, long active1)
  +{
  +   return jjMoveNfa_12(jjStopStringLiteralDfa_12(pos, active0, active1), pos 
+ 1);
  +}
  +private final int jjStartNfaWithStates_12(int pos, int kind, int state)
  +{
  +   jjmatchedKind = kind;
  +   jjmatchedPos = pos;
  +   try { curChar = input_stream.readChar(); }
  +   catch(java.io.IOException e) { return pos + 1; }
  +   return jjMoveNfa_12(state, pos + 1);
  +}
  +private final int jjMoveStringLiteralDfa0_12()
  +{
  +   switch(curChar)
  +   {
  +      case 123:
  +         return jjStopAtPos(0, 118);
  +      default :
  +         return jjMoveNfa_12(0, 0);
  +   }
  +}
  +static final long[] jjbitVec1 = {
  +   0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 
0x7fffffffffffffffL
  +};
  +static final long[] jjbitVec3 = {
  +   0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL, 
0x3fffffffffffffffL
  +};
  +private final int jjMoveNfa_12(int startState, int curPos)
   {
      int[] nextStates;
      int startsAt = 0;
  @@ -298,7 +499,7 @@
               switch(jjstateSet[--i])
               {
                  case 0:
  -                  if ((jjbitVec2[i2] & l2) != 0L && kind > 121)
  +                  if ((jjbitVec0[i2] & l2) != 0L && kind > 121)
                        kind = 121;
                     break;
                  default : break;
  @@ -318,202 +519,19 @@
         catch(java.io.IOException e) { return curPos; }
      }
   }
  -private final int jjStopStringLiteralDfa_3(int pos, long active0, long 
active1)
  -{
  -   switch (pos)
  -   {
  -      case 0:
  -         if ((active0 & 0x10000000000000L) != 0L)
  -            return 8;
  -         return -1;
  -      default :
  -         return -1;
  -   }
  -}
  -private final int jjStartNfa_3(int pos, long active0, long active1)
  -{
  -   return jjMoveNfa_3(jjStopStringLiteralDfa_3(pos, active0, active1), pos + 
1);
  -}
  -private final int jjStartNfaWithStates_3(int pos, int kind, int state)
  -{
  -   jjmatchedKind = kind;
  -   jjmatchedPos = pos;
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) { return pos + 1; }
  -   return jjMoveNfa_3(state, pos + 1);
  -}
  -private final int jjMoveStringLiteralDfa0_3()
  +private final int jjMoveStringLiteralDfa0_4()
   {
  -   switch(curChar)
  -   {
  -      case 36:
  -         return jjStopAtPos(0, 113);
  -      case 40:
  -         return jjStopAtPos(0, 79);
  -      case 41:
  -         return jjStopAtPos(0, 83);
  -      case 42:
  -         return jjStartNfaWithStates_3(0, 52, 8);
  -      case 46:
  -         jjmatchedKind = 108;
  -         return jjMoveStringLiteralDfa1_3(0x0L, 0x200000000000L);
  -      case 47:
  -         jjmatchedKind = 55;
  -         return jjMoveStringLiteralDfa1_3(0x100000000000000L, 0x0L);
  -      case 64:
  -         return jjStopAtPos(0, 80);
  -      default :
  -         return jjMoveNfa_3(6, 0);
  -   }
  +   return jjMoveNfa_4(0, 0);
   }
  -private final int jjMoveStringLiteralDfa1_3(long active0, long active1)
  +private final int jjMoveNfa_4(int startState, int curPos)
   {
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_3(0, active0, active1);
  -      return 1;
  -   }
  -   switch(curChar)
  -   {
  -      case 46:
  -         if ((active1 & 0x200000000000L) != 0L)
  -            return jjStopAtPos(1, 109);
  -         break;
  -      case 47:
  -         if ((active0 & 0x100000000000000L) != 0L)
  -            return jjStopAtPos(1, 56);
  -         break;
  -      default :
  -         break;
  -   }
  -   return jjStartNfa_3(0, active0, active1);
  -}
  -static final long[] jjbitVec4 = {
  -   0x0L, 0xffffffffffffc000L, 0xfffff0007fffffffL, 0x7fffffL
  -};
  -static final long[] jjbitVec5 = {
  -   0x0L, 0x0L, 0x0L, 0xff7fffffff7fffffL
  -};
  -static final long[] jjbitVec6 = {
  -   0x7ff3ffffffffffffL, 0x7ffffffffffffdfeL, 0xffffffffffffffffL, 
0xfc31ffffffffe00fL
  -};
  -static final long[] jjbitVec7 = {
  -   0xffffffL, 0xffffffffffff0000L, 0xf80001ffffffffffL, 0x3L
  -};
  -static final long[] jjbitVec8 = {
  -   0x0L, 0x0L, 0xfffffffbffffd740L, 0xffffd547f7fffL
  -};
  -static final long[] jjbitVec9 = {
  -   0xffffffffffffdffeL, 0xffffffffdffeffffL, 0xffffffffffff0003L, 
0x33fcfffffff199fL
  -};
  -static final long[] jjbitVec10 = {
  -   0xfffe000000000000L, 0xfffffffe027fffffL, 0x7fL, 0x707ffffff0000L
  -};
  -static final long[] jjbitVec11 = {
  -   0x7fffffe00000000L, 0xfffe0000000007feL, 0x7cffffffffffffffL, 
0x60002f7fffL
  -};
  -static final long[] jjbitVec12 = {
  -   0x23ffffffffffffe0L, 0x3ff000000L, 0x3c5fdfffff99fe0L, 0x30003b0000000L
  -};
  -static final long[] jjbitVec13 = {
  -   0x36dfdfffff987e0L, 0x1c00005e000000L, 0x23edfdfffffbafe0L, 0x100000000L
  -};
  -static final long[] jjbitVec14 = {
  -   0x23cdfdfffff99fe0L, 0x3b0000000L, 0x3bfc718d63dc7e0L, 0x0L
  -};
  -static final long[] jjbitVec15 = {
  -   0x3effdfffffddfe0L, 0x300000000L, 0x3effdfffffddfe0L, 0x340000000L
  -};
  -static final long[] jjbitVec16 = {
  -   0x3fffdfffffddfe0L, 0x300000000L, 0x0L, 0x0L
  -};
  -static final long[] jjbitVec17 = {
  -   0xd7ffffffffffeL, 0x3fL, 0x200d6caefef02596L, 0x1fL
  -};
  -static final long[] jjbitVec18 = {
  -   0x0L, 0x3fffffffeffL, 0x0L, 0x0L
  -};
  -static final long[] jjbitVec19 = {
  -   0x0L, 0x0L, 0xffffffff00000000L, 0x7fffffffff003fL
  -};
  -static final long[] jjbitVec20 = {
  -   0x500000000007daedL, 0x2c62ab82315001L, 0xf580c90040000000L, 
0x201080000000007L
  -};
  -static final long[] jjbitVec21 = {
  -   0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffff0fffffffL, 
0x3ffffffffffffffL
  -};
  -static final long[] jjbitVec22 = {
  -   0xffffffff3f3fffffL, 0x3fffffffaaff3f3fL, 0x5fdfffffffffffffL, 
0x1fdc1fff0fcf1fdcL
  -};
  -static final long[] jjbitVec23 = {
  -   0x4c4000000000L, 0x0L, 0x7L, 0x0L
  -};
  -static final long[] jjbitVec24 = {
  -   0x3fe00000080L, 0xfffffffffffffffeL, 0xfffffffe001fffffL, 
0x7ffffffffffffffL
  -};
  -static final long[] jjbitVec25 = {
  -   0x1fffffffffe0L, 0x0L, 0x0L, 0x0L
  -};
  -static final long[] jjbitVec26 = {
  -   0xffffffffffffffffL, 0xffffffffffffffffL, 0x3fffffffffL, 0x0L
  -};
  -static final long[] jjbitVec27 = {
  -   0xffffffffffffffffL, 0xffffffffffffffffL, 0xfffffffffL, 0x0L
  -};
  -static final long[] jjbitVec28 = {
  -   0x0L, 0x0L, 0x80000000000000L, 0xff7fffffff7fffffL
  -};
  -static final long[] jjbitVec29 = {
  -   0xffffffL, 0xffffffffffff0000L, 0xf80001ffffffffffL, 0x30003L
  -};
  -static final long[] jjbitVec30 = {
  -   0xffffffffffffffffL, 0x30000003fL, 0xfffffffbffffd7c0L, 0xffffd547f7fffL
  -};
  -static final long[] jjbitVec31 = {
  -   0xffffffffffffdffeL, 0xffffffffdffeffffL, 0xffffffffffff007bL, 
0x33fcfffffff199fL
  -};
  -static final long[] jjbitVec32 = {
  -   0xfffe000000000000L, 0xfffffffe027fffffL, 0xbbfffffbfffe007fL, 
0x707ffffff0016L
  -};
  -static final long[] jjbitVec33 = {
  -   0x7fffffe00000000L, 0xffff03ff0007ffffL, 0x7cffffffffffffffL, 
0x3ff3dffffef7fffL
  -};
  -static final long[] jjbitVec34 = {
  -   0xf3ffffffffffffeeL, 0xffcfff1e3fffL, 0xd3c5fdfffff99feeL, 
0x3ffcfb080399fL
  -};
  -static final long[] jjbitVec35 = {
  -   0xd36dfdfffff987e4L, 0x1fffc05e003987L, 0xf3edfdfffffbafeeL, 
0xffc100003bbfL
  -};
  -static final long[] jjbitVec36 = {
  -   0xf3cdfdfffff99feeL, 0xffc3b0c0398fL, 0xc3bfc718d63dc7ecL, 0xff8000803dc7L
  -};
  -static final long[] jjbitVec37 = {
  -   0xc3effdfffffddfeeL, 0xffc300603ddfL, 0xc3effdfffffddfecL, 0xffc340603ddfL
  -};
  -static final long[] jjbitVec38 = {
  -   0xc3fffdfffffddfecL, 0xffc300803dcfL, 0x0L, 0x0L
  -};
  -static final long[] jjbitVec39 = {
  -   0x7ff7ffffffffffeL, 0x3ff7fffL, 0x3bff6caefef02596L, 0x3ff3f5fL
  -};
  -static final long[] jjbitVec40 = {
  -   0xc2a003ff03000000L, 0xfffe03fffffffeffL, 0x2fe3ffffebf0fdfL, 0x0L
  -};
  -static final long[] jjbitVec41 = {
  -   0x0L, 0x0L, 0x0L, 0x21fff0000L
  -};
  -static final long[] jjbitVec42 = {
  -   0x3efffe000000a0L, 0xfffffffffffffffeL, 0xfffffffe661fffffL, 
0x77ffffffffffffffL
  -};
  -private final int jjMoveNfa_3(int startState, int curPos)
  -{
  -   int[] nextStates;
  -   int startsAt = 0;
  -   jjnewStateCnt = 227;
  -   int i = 1;
  -   jjstateSet[0] = startState;
  -   int j, kind = 0x7fffffff;
  -   for (;;)
  +   int[] nextStates;
  +   int startsAt = 0;
  +   jjnewStateCnt = 17;
  +   int i = 1;
  +   jjstateSet[0] = startState;
  +   int j, kind = 0x7fffffff;
  +   for (;;)
      {
         if (++jjround == 0x7fffffff)
            ReInitRounds();
  @@ -524,1249 +542,332 @@
            {
               switch(jjstateSet[--i])
               {
  -               case 6:
  -                  if ((0x100002600L & l) != 0L)
  -                  {
  -                     if (kind > 2)
  -                        kind = 2;
  -                     jjCheckNAddTwoStates(18, 19);
  -                  }
  -                  else if (curChar == 42)
  -                     jjstateSet[jjnewStateCnt++] = 8;
  +               case 0:
  +                  if ((0x100002600L & l) == 0L)
  +                     break;
  +                  if (kind > 6)
  +                     kind = 6;
  +                  jjCheckNAddStates(6, 8);
                     break;
                  case 1:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(0, 1);
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(2, 5);
                     break;
                  case 2:
  -                  if (curChar == 58 && kind > 9)
  -                     kind = 9;
  +                  jjCheckNAddTwoStates(2, 5);
                     break;
  -               case 3:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 2;
  +               case 4:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 3;
  +                  break;
  +               case 5:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 4;
  +                  break;
  +               case 6:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 1;
                     break;
                  case 7:
  -                  if (curChar == 42)
  -                     jjstateSet[jjnewStateCnt++] = 8;
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(8, 14);
                     break;
                  case 8:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 9;
  +                  jjCheckNAddTwoStates(8, 14);
                     break;
                  case 10:
  -                  if ((0x3ff600000000000L & l) == 0L)
  +                  if ((0x100002600L & l) == 0L)
                        break;
  -                  if (kind > 54)
  -                     kind = 54;
  -                  jjstateSet[jjnewStateCnt++] = 10;
  +                  if (kind > 6)
  +                     kind = 6;
  +                  jjCheckNAddTwoStates(10, 12);
                     break;
  -               case 12:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(2, 3);
  +               case 11:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 7;
                     break;
                  case 13:
  -                  if (curChar == 40 && kind > 102)
  -                     kind = 102;
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 9;
                     break;
  -               case 17:
  -                  if ((0x100002600L & l) == 0L)
  -                     break;
  -                  if (kind > 2)
  -                     kind = 2;
  -                  jjCheckNAddTwoStates(18, 19);
  +               case 14:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 13;
                     break;
  -               case 18:
  +               case 16:
                     if ((0x100002600L & l) == 0L)
                        break;
  -                  if (kind > 2)
  -                     kind = 2;
  -                  jjCheckNAdd(18);
  +                  if (kind > 8)
  +                     kind = 8;
  +                  jjCheckNAdd(16);
                     break;
  -               case 19:
  -                  if ((0x100002600L & l) == 0L)
  -                     break;
  -                  if (kind > 4)
  -                     kind = 4;
  -                  jjCheckNAdd(19);
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      else if (curChar < 128)
  +      {
  +         long l = 1L << (curChar & 077);
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 0:
  +                  if (curChar == 123)
  +                     jjCheckNAddTwoStates(6, 11);
                     break;
  -               case 22:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(4, 5);
  +               case 2:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(9, 10);
                     break;
  -               case 23:
  -                  if (curChar == 58 && kind > 5)
  +               case 3:
  +                  if (curChar == 125 && kind > 5)
                        kind = 5;
                     break;
  -               case 24:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 23;
  -                  break;
  -               case 29:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(6, 7);
  -                  break;
  -               case 30:
  -                  if (curChar == 40 && kind > 101)
  -                     kind = 101;
  -                  break;
  -               case 38:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(8, 9);
  +               case 8:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(11, 12);
                     break;
  -               case 39:
  -                  if (curChar == 58 && kind > 6)
  +               case 9:
  +                  if (curChar != 125)
  +                     break;
  +                  if (kind > 6)
                        kind = 6;
  +                  jjAddStates(13, 14);
                     break;
  -               case 40:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 39;
  -                  break;
  -               case 50:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(10, 11);
  -                  break;
  -               case 51:
  -                  if (curChar == 58 && kind > 10)
  -                     kind = 10;
  -                  break;
  -               case 52:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 51;
  -                  break;
  -               case 56:
  -                  if (curChar == 45)
  -                     jjstateSet[jjnewStateCnt++] = 55;
  -                  break;
  -               case 59:
  -                  if (curChar == 45)
  -                     jjstateSet[jjnewStateCnt++] = 58;
  -                  break;
  -               case 71:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(12, 13);
  -                  break;
  -               case 72:
  -                  if (curChar == 58 && kind > 7)
  -                     kind = 7;
  -                  break;
  -               case 73:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 72;
  -                  break;
  -               case 79:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(14, 15);
  -                  break;
  -               case 80:
  -                  if (curChar == 58 && kind > 13)
  -                     kind = 13;
  -                  break;
  -               case 81:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 80;
  -                  break;
  -               case 88:
  -                  if (curChar == 45)
  -                     jjstateSet[jjnewStateCnt++] = 87;
  -                  break;
  -               case 98:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(16, 17);
  -                  break;
  -               case 99:
  -                  if (curChar == 58 && kind > 15)
  -                     kind = 15;
  -                  break;
  -               case 100:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 99;
  +               case 12:
  +                  if (curChar == 123)
  +                     jjCheckNAdd(11);
                     break;
  -               case 109:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(18, 19);
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      else
  +      {
  +         int i2 = (curChar & 0xff) >> 6;
  +         long l2 = 1L << (curChar & 077);
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 2:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(9, 10);
                     break;
  -               case 110:
  -                  if (curChar == 40 && kind > 103)
  -                     kind = 103;
  -                  break;
  -               case 121:
  -                  if (curChar == 45)
  -                     jjstateSet[jjnewStateCnt++] = 120;
  -                  break;
  -               case 133:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(20, 21);
  -                  break;
  -               case 134:
  -                  if (curChar == 58 && kind > 8)
  -                     kind = 8;
  -                  break;
  -               case 135:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 134;
  -                  break;
  -               case 144:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(22, 23);
  -                  break;
  -               case 145:
  -                  if (curChar == 58 && kind > 11)
  -                     kind = 11;
  -                  break;
  -               case 146:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 145;
  -                  break;
  -               case 154:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(24, 25);
  -                  break;
  -               case 155:
  -                  if (curChar == 58 && kind > 17)
  -                     kind = 17;
  -                  break;
  -               case 156:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 155;
  -                  break;
  -               case 160:
  -                  if (curChar == 45)
  -                     jjstateSet[jjnewStateCnt++] = 159;
  -                  break;
  -               case 163:
  -                  if (curChar == 45)
  -                     jjstateSet[jjnewStateCnt++] = 162;
  -                  break;
  -               case 173:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(26, 27);
  -                  break;
  -               case 174:
  -                  if (curChar == 58 && kind > 12)
  -                     kind = 12;
  -                  break;
  -               case 175:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 174;
  -                  break;
  -               case 182:
  -                  if (curChar == 45)
  -                     jjstateSet[jjnewStateCnt++] = 181;
  -                  break;
  -               case 192:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(28, 29);
  -                  break;
  -               case 193:
  -                  if (curChar == 58 && kind > 14)
  -                     kind = 14;
  -                  break;
  -               case 194:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 193;
  -                  break;
  -               case 204:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(30, 31);
  -                  break;
  -               case 205:
  -                  if (curChar == 58 && kind > 16)
  -                     kind = 16;
  -                  break;
  -               case 206:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 205;
  -                  break;
  -               case 215:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(32, 33);
  -                  break;
  -               case 216:
  -                  if (curChar == 40 && kind > 100)
  -                     kind = 100;
  -                  break;
  -               case 220:
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                     jjAddStates(34, 35);
  -                  break;
  -               case 221:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 222;
  -                  break;
  -               case 222:
  -                  if (curChar == 42 && kind > 53)
  -                     kind = 53;
  -                  break;
  -               case 223:
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                     jjAddStates(36, 37);
  -                  break;
  -               case 224:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 225;
  -                  break;
  -               case 226:
  -                  if ((0x3ff600000000000L & l) == 0L)
  -                     break;
  -                  if (kind > 115)
  -                     kind = 115;
  -                  jjstateSet[jjnewStateCnt++] = 226;
  +               case 8:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(11, 12);
                     break;
                  default : break;
               }
            } while(i != startsAt);
         }
  -      else if (curChar < 128)
  +      if (kind != 0x7fffffff)
         {
  -         long l = 1L << (curChar & 077);
  -         MatchLoop: do
  +         jjmatchedKind = kind;
  +         jjmatchedPos = curPos;
  +         kind = 0x7fffffff;
  +      }
  +      ++curPos;
  +      if ((i = jjnewStateCnt) == (startsAt = 17 - (jjnewStateCnt = 
startsAt)))
  +         return curPos;
  +      try { curChar = input_stream.readChar(); }
  +      catch(java.io.IOException e) { return curPos; }
  +   }
  +}
  +private final int jjStopStringLiteralDfa_6(int pos, long active0, long 
active1)
  +{
  +   switch (pos)
  +   {
  +      case 0:
  +         if ((active0 & 0x60030000000000L) != 0L || (active1 & 
0x7600000000L) != 0L)
            {
  -            switch(jjstateSet[--i])
  -            {
  -               case 6:
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                  {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAddStates(38, 42);
  -                  }
  -                  if (curChar == 110)
  -                     jjAddStates(43, 44);
  -                  else if (curChar == 102)
  -                     jjAddStates(45, 46);
  -                  else if (curChar == 97)
  -                     jjAddStates(47, 49);
  -                  else if (curChar == 112)
  -                     jjAddStates(50, 53);
  -                  else if (curChar == 100)
  -                     jjAddStates(54, 55);
  -                  else if (curChar == 99)
  -                     jjAddStates(56, 57);
  -                  else if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 15;
  -                  else if (curChar == 115)
  -                     jjstateSet[jjnewStateCnt++] = 5;
  -                  break;
  -               case 0:
  -                  if (curChar == 102)
  -                     jjAddStates(0, 1);
  -                  break;
  -               case 4:
  -                  if (curChar == 108)
  -                     jjstateSet[jjnewStateCnt++] = 0;
  -                  break;
  -               case 5:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 4;
  -                  break;
  -               case 9:
  -               case 10:
  -                  if ((0x7fffffe87fffffeL & l) == 0L)
  -                     break;
  -                  if (kind > 54)
  -                     kind = 54;
  -                  jjCheckNAdd(10);
  -                  break;
  -               case 11:
  -                  if (curChar == 116)
  -                     jjAddStates(2, 3);
  -                  break;
  -               case 14:
  -                  if (curChar == 120)
  -                     jjstateSet[jjnewStateCnt++] = 11;
  -                  break;
  -               case 15:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 14;
  -                  break;
  -               case 16:
  -                  if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 15;
  -                  break;
  -               case 20:
  -                  if (curChar == 99)
  -                     jjAddStates(56, 57);
  -                  break;
  -               case 21:
  -                  if (curChar == 100)
  -                     jjAddStates(4, 5);
  -                  break;
  -               case 25:
  -                  if (curChar == 108)
  -                     jjstateSet[jjnewStateCnt++] = 21;
  -                  break;
  -               case 26:
  -                  if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 25;
  -                  break;
  -               case 27:
  -                  if (curChar == 104)
  -                     jjstateSet[jjnewStateCnt++] = 26;
  -                  break;
  -               case 28:
  -                  if (curChar == 116)
  -                     jjAddStates(6, 7);
  -                  break;
  -               case 31:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 28;
  -                  break;
  -               case 32:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 31;
  -                  break;
  -               case 33:
  -                  if (curChar == 109)
  -                     jjstateSet[jjnewStateCnt++] = 32;
  -                  break;
  -               case 34:
  -                  if (curChar == 109)
  -                     jjstateSet[jjnewStateCnt++] = 33;
  -                  break;
  -               case 35:
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 34;
  -                  break;
  -               case 36:
  -                  if (curChar == 100)
  -                     jjAddStates(54, 55);
  -                  break;
  -               case 37:
  -                  if (curChar == 116)
  -                     jjAddStates(8, 9);
  -                  break;
  -               case 41:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 37;
  -                  break;
  -               case 42:
  -                  if (curChar == 97)
  -                     jjstateSet[jjnewStateCnt++] = 41;
  -                  break;
  -               case 43:
  -                  if (curChar == 100)
  -                     jjstateSet[jjnewStateCnt++] = 42;
  -                  break;
  -               case 44:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 43;
  -                  break;
  -               case 45:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 44;
  -                  break;
  -               case 46:
  -                  if (curChar == 99)
  -                     jjstateSet[jjnewStateCnt++] = 45;
  -                  break;
  -               case 47:
  -                  if (curChar == 115)
  -                     jjstateSet[jjnewStateCnt++] = 46;
  -                  break;
  -               case 48:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 47;
  -                  break;
  -               case 49:
  -                  if (curChar == 102)
  -                     jjAddStates(10, 11);
  -                  break;
  -               case 53:
  -                  if (curChar == 108)
  -                     jjstateSet[jjnewStateCnt++] = 49;
  -                  break;
  -               case 54:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 53;
  -                  break;
  -               case 55:
  -                  if (curChar == 115)
  -                     jjstateSet[jjnewStateCnt++] = 54;
  -                  break;
  -               case 57:
  -                  if (curChar == 114)
  -                     jjstateSet[jjnewStateCnt++] = 56;
  -                  break;
  -               case 58:
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 57;
  -                  break;
  -               case 60:
  -                  if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 59;
  -                  break;
  -               case 61:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 60;
  -                  break;
  -               case 62:
  -                  if (curChar == 97)
  -                     jjstateSet[jjnewStateCnt++] = 61;
  -                  break;
  -               case 63:
  -                  if (curChar == 100)
  -                     jjstateSet[jjnewStateCnt++] = 62;
  -                  break;
  -               case 64:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 63;
  -                  break;
  -               case 65:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 64;
  -                  break;
  -               case 66:
  -                  if (curChar == 99)
  -                     jjstateSet[jjnewStateCnt++] = 65;
  -                  break;
  -               case 67:
  -                  if (curChar == 115)
  -                     jjstateSet[jjnewStateCnt++] = 66;
  -                  break;
  -               case 68:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 67;
  -                  break;
  -               case 69:
  -                  if (curChar == 112)
  -                     jjAddStates(50, 53);
  -                  break;
  -               case 70:
  -                  if (curChar == 116)
  -                     jjAddStates(12, 13);
  -                  break;
  -               case 74:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 70;
  -                  break;
  -               case 75:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 74;
  -                  break;
  -               case 76:
  -                  if (curChar == 114)
  -                     jjstateSet[jjnewStateCnt++] = 75;
  -                  break;
  -               case 77:
  -                  if (curChar == 97)
  -                     jjstateSet[jjnewStateCnt++] = 76;
  -                  break;
  -               case 78:
  -                  if (curChar == 103)
  -                     jjAddStates(14, 15);
  -                  break;
  -               case 82:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 78;
  -                  break;
  -               case 83:
  -                  if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 82;
  -                  break;
  -               case 84:
  -                  if (curChar == 108)
  -                     jjstateSet[jjnewStateCnt++] = 83;
  -                  break;
  -               case 85:
  -                  if (curChar == 98)
  -                     jjstateSet[jjnewStateCnt++] = 84;
  -                  break;
  -               case 86:
  -                  if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 85;
  -                  break;
  -               case 87:
  -                  if (curChar == 115)
  -                     jjstateSet[jjnewStateCnt++] = 86;
  -                  break;
  -               case 89:
  -                  if (curChar == 103)
  -                     jjstateSet[jjnewStateCnt++] = 88;
  -                  break;
  -               case 90:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 89;
  -                  break;
  -               case 91:
  -                  if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 90;
  -                  break;
  -               case 92:
  -                  if (curChar == 100)
  -                     jjstateSet[jjnewStateCnt++] = 91;
  -                  break;
  -               case 93:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 92;
  -                  break;
  -               case 94:
  -                  if (curChar == 99)
  -                     jjstateSet[jjnewStateCnt++] = 93;
  -                  break;
  -               case 95:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 94;
  -                  break;
  -               case 96:
  -                  if (curChar == 114)
  -                     jjstateSet[jjnewStateCnt++] = 95;
  -                  break;
  -               case 97:
  -                  if (curChar == 103)
  -                     jjAddStates(16, 17);
  -                  break;
  -               case 101:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 97;
  -                  break;
  -               case 102:
  -                  if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 101;
  -                  break;
  -               case 103:
  -                  if (curChar == 100)
  -                     jjstateSet[jjnewStateCnt++] = 102;
  -                  break;
  -               case 104:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 103;
  -                  break;
  -               case 105:
  -                  if (curChar == 99)
  -                     jjstateSet[jjnewStateCnt++] = 104;
  -                  break;
  -               case 106:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 105;
  -                  break;
  -               case 107:
  -                  if (curChar == 114)
  -                     jjstateSet[jjnewStateCnt++] = 106;
  -                  break;
  -               case 108:
  -                  if (curChar == 110)
  -                     jjAddStates(18, 19);
  -                  break;
  -               case 111:
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 108;
  -                  break;
  -               case 112:
  -                  if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 111;
  -                  break;
  -               case 113:
  -                  if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 112;
  -                  break;
  -               case 114:
  -                  if (curChar == 99)
  -                     jjstateSet[jjnewStateCnt++] = 113;
  -                  break;
  -               case 115:
  -                  if (curChar == 117)
  -                     jjstateSet[jjnewStateCnt++] = 114;
  -                  break;
  -               case 116:
  -                  if (curChar == 114)
  -                     jjstateSet[jjnewStateCnt++] = 115;
  -                  break;
  -               case 117:
  -                  if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 116;
  -                  break;
  -               case 118:
  -                  if (curChar == 115)
  -                     jjstateSet[jjnewStateCnt++] = 117;
  -                  break;
  -               case 119:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 118;
  -                  break;
  -               case 120:
  -                  if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 119;
  -                  break;
  -               case 122:
  -                  if (curChar == 103)
  -                     jjstateSet[jjnewStateCnt++] = 121;
  -                  break;
  -               case 123:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 122;
  -                  break;
  -               case 124:
  -                  if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 123;
  -                  break;
  -               case 125:
  -                  if (curChar == 115)
  -                     jjstateSet[jjnewStateCnt++] = 124;
  -                  break;
  -               case 126:
  -                  if (curChar == 115)
  -                     jjstateSet[jjnewStateCnt++] = 125;
  -                  break;
  -               case 127:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 126;
  -                  break;
  -               case 128:
  -                  if (curChar == 99)
  -                     jjstateSet[jjnewStateCnt++] = 127;
  -                  break;
  -               case 129:
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 128;
  -                  break;
  -               case 130:
  -                  if (curChar == 114)
  -                     jjstateSet[jjnewStateCnt++] = 129;
  -                  break;
  -               case 131:
  -                  if (curChar == 97)
  -                     jjAddStates(47, 49);
  -                  break;
  -               case 132:
  -                  if (curChar == 101)
  -                     jjAddStates(20, 21);
  -                  break;
  -               case 136:
  -                  if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 132;
  -                  break;
  -               case 137:
  -                  if (curChar == 117)
  -                     jjstateSet[jjnewStateCnt++] = 136;
  -                  break;
  -               case 138:
  -                  if (curChar == 98)
  -                     jjstateSet[jjnewStateCnt++] = 137;
  -                  break;
  -               case 139:
  -                  if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 138;
  -                  break;
  -               case 140:
  -                  if (curChar == 114)
  -                     jjstateSet[jjnewStateCnt++] = 139;
  -                  break;
  -               case 141:
  -                  if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 140;
  -                  break;
  -               case 142:
  -                  if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 141;
  -                  break;
  -               case 143:
  -                  if (curChar == 114)
  -                     jjAddStates(22, 23);
  -                  break;
  -               case 147:
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 143;
  -                  break;
  -               case 148:
  -                  if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 147;
  -                  break;
  -               case 149:
  -                  if (curChar == 115)
  -                     jjstateSet[jjnewStateCnt++] = 148;
  -                  break;
  -               case 150:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 149;
  -                  break;
  -               case 151:
  -                  if (curChar == 99)
  -                     jjstateSet[jjnewStateCnt++] = 150;
  -                  break;
  -               case 152:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 151;
  -                  break;
  -               case 153:
  -                  if (curChar == 102)
  -                     jjAddStates(24, 25);
  -                  break;
  -               case 157:
  -                  if (curChar == 108)
  -                     jjstateSet[jjnewStateCnt++] = 153;
  -                  break;
  -               case 158:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 157;
  -                  break;
  -               case 159:
  -                  if (curChar == 115)
  -                     jjstateSet[jjnewStateCnt++] = 158;
  -                  break;
  -               case 161:
  -                  if (curChar == 114)
  -                     jjstateSet[jjnewStateCnt++] = 160;
  -                  break;
  -               case 162:
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 161;
  -                  break;
  -               case 164:
  -                  if (curChar == 114)
  -                     jjstateSet[jjnewStateCnt++] = 163;
  -                  break;
  -               case 165:
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 164;
  -                  break;
  -               case 166:
  -                  if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 165;
  -                  break;
  -               case 167:
  -                  if (curChar == 115)
  -                     jjstateSet[jjnewStateCnt++] = 166;
  -                  break;
  -               case 168:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 167;
  -                  break;
  -               case 169:
  -                  if (curChar == 99)
  -                     jjstateSet[jjnewStateCnt++] = 168;
  -                  break;
  -               case 170:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 169;
  -                  break;
  -               case 171:
  -                  if (curChar == 102)
  -                     jjAddStates(45, 46);
  -                  break;
  -               case 172:
  -                  if (curChar == 103)
  -                     jjAddStates(26, 27);
  -                  break;
  -               case 176:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 172;
  -                  break;
  -               case 177:
  -                  if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 176;
  -                  break;
  -               case 178:
  -                  if (curChar == 108)
  -                     jjstateSet[jjnewStateCnt++] = 177;
  -                  break;
  -               case 179:
  -                  if (curChar == 98)
  -                     jjstateSet[jjnewStateCnt++] = 178;
  -                  break;
  -               case 180:
  -                  if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 179;
  -                  break;
  -               case 181:
  -                  if (curChar == 115)
  -                     jjstateSet[jjnewStateCnt++] = 180;
  -                  break;
  -               case 183:
  -                  if (curChar == 103)
  -                     jjstateSet[jjnewStateCnt++] = 182;
  -                  break;
  -               case 184:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 183;
  -                  break;
  -               case 185:
  -                  if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 184;
  -                  break;
  -               case 186:
  -                  if (curChar == 119)
  -                     jjstateSet[jjnewStateCnt++] = 185;
  -                  break;
  -               case 187:
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 186;
  -                  break;
  -               case 188:
  -                  if (curChar == 108)
  -                     jjstateSet[jjnewStateCnt++] = 187;
  -                  break;
  -               case 189:
  -                  if (curChar == 108)
  -                     jjstateSet[jjnewStateCnt++] = 188;
  -                  break;
  -               case 190:
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 189;
  -                  break;
  -               case 191:
  -                  if (curChar == 103)
  -                     jjAddStates(28, 29);
  -                  break;
  -               case 195:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 191;
  -                  break;
  -               case 196:
  -                  if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 195;
  -                  break;
  -               case 197:
  -                  if (curChar == 119)
  -                     jjstateSet[jjnewStateCnt++] = 196;
  -                  break;
  -               case 198:
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 197;
  -                  break;
  -               case 199:
  -                  if (curChar == 108)
  -                     jjstateSet[jjnewStateCnt++] = 198;
  -                  break;
  -               case 200:
  -                  if (curChar == 108)
  -                     jjstateSet[jjnewStateCnt++] = 199;
  -                  break;
  -               case 201:
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 200;
  -                  break;
  -               case 202:
  -                  if (curChar == 110)
  -                     jjAddStates(43, 44);
  -                  break;
  -               case 203:
  -                  if (curChar == 101)
  -                     jjAddStates(30, 31);
  -                  break;
  -               case 207:
  -                  if (curChar == 99)
  -                     jjstateSet[jjnewStateCnt++] = 203;
  -                  break;
  -               case 208:
  -                  if (curChar == 97)
  -                     jjstateSet[jjnewStateCnt++] = 207;
  -                  break;
  -               case 209:
  -                  if (curChar == 112)
  -                     jjstateSet[jjnewStateCnt++] = 208;
  -                  break;
  -               case 210:
  -                  if (curChar == 115)
  -                     jjstateSet[jjnewStateCnt++] = 209;
  -                  break;
  -               case 211:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 210;
  -                  break;
  -               case 212:
  -                  if (curChar == 109)
  -                     jjstateSet[jjnewStateCnt++] = 211;
  -                  break;
  -               case 213:
  -                  if (curChar == 97)
  -                     jjstateSet[jjnewStateCnt++] = 212;
  -                  break;
  -               case 214:
  -                  if (curChar == 101)
  -                     jjAddStates(32, 33);
  -                  break;
  -               case 217:
  -                  if (curChar == 100)
  -                     jjstateSet[jjnewStateCnt++] = 214;
  -                  break;
  -               case 218:
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 217;
  -                  break;
  -               case 219:
  -                  if ((0x7fffffe87fffffeL & l) == 0L)
  -                     break;
  -                  if (kind > 115)
  -                     kind = 115;
  -                  jjCheckNAddStates(38, 42);
  -                  break;
  -               case 220:
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(220, 221);
  -                  break;
  -               case 223:
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(223, 224);
  -                  break;
  -               case 225:
  -               case 226:
  -                  if ((0x7fffffe87fffffeL & l) == 0L)
  -                     break;
  -                  if (kind > 115)
  -                     kind = 115;
  -                  jjCheckNAdd(226);
  -                  break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      else
  -      {
  -         int i2 = (curChar & 0xff) >> 6;
  -         long l2 = 1L << (curChar & 077);
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 6:
  -                  if ((jjbitVec5[i2] & l2) == 0L)
  -                     break;
  -                  if (kind > 115)
  -                     kind = 115;
  -                  jjCheckNAddStates(38, 42);
  -                  break;
  -               case 9:
  -                  if ((jjbitVec5[i2] & l2) == 0L)
  -                     break;
  -                  if (kind > 54)
  -                     kind = 54;
  -                  jjCheckNAdd(10);
  -                  break;
  -               case 10:
  -                  if ((jjbitVec28[i2] & l2) == 0L)
  -                     break;
  -                  if (kind > 54)
  -                     kind = 54;
  -                  jjCheckNAdd(10);
  -                  break;
  -               case 220:
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(220, 221);
  -                  break;
  -               case 223:
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(223, 224);
  -                  break;
  -               case 225:
  -                  if ((jjbitVec5[i2] & l2) == 0L)
  -                     break;
  -                  if (kind > 115)
  -                     kind = 115;
  -                  jjCheckNAdd(226);
  -                  break;
  -               case 226:
  -                  if ((jjbitVec28[i2] & l2) == 0L)
  -                     break;
  -                  if (kind > 115)
  -                     kind = 115;
  -                  jjCheckNAdd(226);
  -                  break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      if (kind != 0x7fffffff)
  -      {
  -         jjmatchedKind = kind;
  -         jjmatchedPos = curPos;
  -         kind = 0x7fffffff;
  -      }
  -      ++curPos;
  -      if ((i = jjnewStateCnt) == (startsAt = 227 - (jjnewStateCnt = 
startsAt)))
  -         return curPos;
  -      try { curChar = input_stream.readChar(); }
  -      catch(java.io.IOException e) { return curPos; }
  -   }
  -}
  -private final int jjStopStringLiteralDfa_6(int pos, long active0, long 
active1)
  -{
  -   switch (pos)
  -   {
  -      case 0:
  -         if ((active0 & 0x4000000000L) != 0L)
  -         {
  -            jjmatchedKind = 115;
  -            return 10;
  +            jjmatchedKind = 116;
  +            return 65;
            }
  -         if ((active0 & 0x1003000000000L) != 0L || (active1 & 0xec0000000L) 
!= 0L)
  +         if ((active0 & 0x40000000000L) != 0L)
            {
  -            jjmatchedKind = 115;
  -            return 27;
  +            jjmatchedKind = 116;
  +            return 17;
            }
  +         if ((active1 & 0x80000000000000L) != 0L)
  +            return 46;
            return -1;
         case 1:
  -         if ((active0 & 0x1003000000000L) != 0L || (active1 & 0xec0000000L) 
!= 0L)
  +         if ((active0 & 0x40000000000L) != 0L)
            {
  -            jjmatchedKind = 115;
  +            jjmatchedKind = 116;
               jjmatchedPos = 1;
  -            return 27;
  +            return 16;
            }
  -         if ((active0 & 0x4000000000L) != 0L)
  +         if ((active0 & 0x60030000000000L) != 0L || (active1 & 
0x7600000000L) != 0L)
            {
  -            jjmatchedKind = 115;
  +            jjmatchedKind = 116;
               jjmatchedPos = 1;
  -            return 9;
  +            return 65;
            }
            return -1;
         case 2:
  -         if ((active0 & 0x1007000000000L) != 0L || (active1 & 0xec0000000L) 
!= 0L)
  +         if ((active0 & 0x60070000000000L) != 0L || (active1 & 
0x7600000000L) != 0L)
            {
  -            jjmatchedKind = 115;
  +            jjmatchedKind = 116;
               jjmatchedPos = 2;
  -            return 27;
  +            return 65;
            }
            return -1;
         case 3:
  -         if ((active0 & 0x1001000000000L) != 0L || (active1 & 0x200000000L) 
!= 0L)
  -            return 27;
  -         if ((active0 & 0x6000000000L) != 0L || (active1 & 0xcc0000000L) != 
0L)
  +         if ((active0 & 0x20010000000000L) != 0L || (active1 & 
0x1000000000L) != 0L)
  +            return 65;
  +         if ((active0 & 0x40060000000000L) != 0L || (active1 & 
0x6600000000L) != 0L)
            {
  -            jjmatchedKind = 115;
  +            jjmatchedKind = 116;
               jjmatchedPos = 3;
  -            return 27;
  +            return 65;
            }
            return -1;
         case 4:
  -         if ((active0 & 0x6000000000L) != 0L || (active1 & 0xcc0000000L) != 
0L)
  +         if ((active0 & 0x40000000000000L) != 0L)
  +            return 65;
  +         if ((active0 & 0x60000000000L) != 0L || (active1 & 0x6600000000L) 
!= 0L)
            {
  -            jjmatchedKind = 115;
  +            jjmatchedKind = 116;
               jjmatchedPos = 4;
  -            return 27;
  +            return 65;
            }
            return -1;
         case 5:
  -         if ((active0 & 0x6000000000L) != 0L || (active1 & 0xcc0000000L) != 
0L)
  +         if ((active0 & 0x60000000000L) != 0L || (active1 & 0x6600000000L) 
!= 0L)
            {
  -            jjmatchedKind = 115;
  +            jjmatchedKind = 116;
               jjmatchedPos = 5;
  -            return 27;
  +            return 65;
            }
            return -1;
         case 6:
  -         if ((active0 & 0x4000000000L) != 0L || (active1 & 0x880000000L) != 
0L)
  +         if ((active0 & 0x20000000000L) != 0L || (active1 & 0x2200000000L) 
!= 0L)
  +            return 65;
  +         if ((active0 & 0x40000000000L) != 0L || (active1 & 0x4400000000L) 
!= 0L)
            {
  -            jjmatchedKind = 115;
  +            jjmatchedKind = 116;
               jjmatchedPos = 6;
  -            return 27;
  +            return 65;
            }
  -         if ((active0 & 0x2000000000L) != 0L || (active1 & 0x440000000L) != 
0L)
  -            return 27;
            return -1;
         case 7:
  -         if ((active1 & 0x80000000L) != 0L)
  -            return 27;
  -         if ((active0 & 0x4000000000L) != 0L || (active1 & 0x800000000L) != 
0L)
  +         if ((active1 & 0x400000000L) != 0L)
  +            return 65;
  +         if ((active0 & 0x40000000000L) != 0L || (active1 & 0x4000000000L) 
!= 0L)
            {
  -            jjmatchedKind = 115;
  +            jjmatchedKind = 116;
               jjmatchedPos = 7;
  -            return 27;
  +            return 65;
            }
            return -1;
         case 8:
  -         if ((active1 & 0x800000000L) != 0L)
  +         if ((active0 & 0x40000000000L) != 0L)
  +            return 65;
  +         if ((active1 & 0x4000000000L) != 0L)
            {
  -            jjmatchedKind = 115;
  +            jjmatchedKind = 116;
               jjmatchedPos = 8;
  -            return 27;
  +            return 65;
            }
  -         if ((active0 & 0x4000000000L) != 0L)
  -            return 27;
            return -1;
         case 9:
  -         if ((active1 & 0x800000000L) != 0L)
  +         if ((active1 & 0x4000000000L) != 0L)
            {
  -            jjmatchedKind = 115;
  +            jjmatchedKind = 116;
               jjmatchedPos = 9;
  -            return 27;
  +            return 65;
            }
            return -1;
         case 10:
  -         if ((active1 & 0x800000000L) != 0L)
  +         if ((active1 & 0x4000000000L) != 0L)
            {
  -            jjmatchedKind = 115;
  +            jjmatchedKind = 116;
               jjmatchedPos = 10;
  -            return 27;
  +            return 65;
            }
            return -1;
         case 11:
  -         if ((active1 & 0x800000000L) != 0L)
  +         if ((active1 & 0x4000000000L) != 0L)
            {
  -            jjmatchedKind = 115;
  +            jjmatchedKind = 116;
               jjmatchedPos = 11;
  -            return 27;
  +            return 65;
            }
            return -1;
         case 12:
  -         if ((active1 & 0x800000000L) != 0L)
  +         if ((active1 & 0x4000000000L) != 0L)
            {
  -            jjmatchedKind = 115;
  +            jjmatchedKind = 116;
               jjmatchedPos = 12;
  -            return 27;
  +            return 65;
            }
            return -1;
         case 13:
  -         if ((active1 & 0x800000000L) != 0L)
  +         if ((active1 & 0x4000000000L) != 0L)
            {
  -            jjmatchedKind = 115;
  +            jjmatchedKind = 116;
               jjmatchedPos = 13;
  -            return 27;
  +            return 65;
            }
            return -1;
         case 14:
  -         if ((active1 & 0x800000000L) != 0L)
  +         if ((active1 & 0x4000000000L) != 0L)
            {
  -            jjmatchedKind = 115;
  +            jjmatchedKind = 116;
               jjmatchedPos = 14;
  -            return 27;
  +            return 65;
            }
            return -1;
         case 15:
  -         if ((active1 & 0x800000000L) != 0L)
  +         if ((active1 & 0x4000000000L) != 0L)
            {
  -            jjmatchedKind = 115;
  +            jjmatchedKind = 116;
               jjmatchedPos = 15;
  -            return 27;
  +            return 65;
            }
            return -1;
         case 16:
  -         if ((active1 & 0x800000000L) != 0L)
  +         if ((active1 & 0x4000000000L) != 0L)
            {
  -            jjmatchedKind = 115;
  +            jjmatchedKind = 116;
               jjmatchedPos = 16;
  -            return 27;
  +            return 65;
            }
            return -1;
         case 17:
  -         if ((active1 & 0x800000000L) != 0L)
  +         if ((active1 & 0x4000000000L) != 0L)
            {
  -            jjmatchedKind = 115;
  +            jjmatchedKind = 116;
               jjmatchedPos = 17;
  -            return 27;
  +            return 65;
            }
            return -1;
         case 18:
  -         if ((active1 & 0x800000000L) != 0L)
  +         if ((active1 & 0x4000000000L) != 0L)
            {
  -            jjmatchedKind = 115;
  +            jjmatchedKind = 116;
               jjmatchedPos = 18;
  -            return 27;
  +            return 65;
            }
            return -1;
         case 19:
  -         if ((active1 & 0x800000000L) != 0L)
  +         if ((active1 & 0x4000000000L) != 0L)
            {
  -            jjmatchedKind = 115;
  +            jjmatchedKind = 116;
               jjmatchedPos = 19;
  -            return 27;
  +            return 65;
            }
            return -1;
         case 20:
  -         if ((active1 & 0x800000000L) != 0L)
  +         if ((active1 & 0x4000000000L) != 0L)
            {
  -            jjmatchedKind = 115;
  +            jjmatchedKind = 116;
               jjmatchedPos = 20;
  -            return 27;
  +            return 65;
            }
            return -1;
         default :
  @@ -1790,32 +891,34 @@
      switch(curChar)
      {
         case 36:
  -         return jjStopAtPos(0, 113);
  +         return jjStopAtPos(0, 114);
         case 41:
  -         return jjStopAtPos(0, 83);
  +         return jjStopAtPos(0, 88);
         case 46:
  -         jjmatchedKind = 108;
  -         return jjMoveStringLiteralDfa1_6(0x0L, 0x200000000000L);
  +         jjmatchedKind = 109;
  +         return jjMoveStringLiteralDfa1_6(0x0L, 0x400000000000L);
         case 97:
  -         return jjMoveStringLiteralDfa1_6(0x4000000000L, 0x0L);
  +         return jjMoveStringLiteralDfa1_6(0x40000000000L, 0x0L);
         case 99:
  -         return jjMoveStringLiteralDfa1_6(0x0L, 0x40000000L);
  +         return jjMoveStringLiteralDfa1_6(0x0L, 0x200000000L);
         case 100:
  -         return jjMoveStringLiteralDfa1_6(0x0L, 0x80000000L);
  +         return jjMoveStringLiteralDfa1_6(0x0L, 0x400000000L);
         case 101:
  -         return jjMoveStringLiteralDfa1_6(0x2000000000L, 0x0L);
  +         return jjMoveStringLiteralDfa1_6(0x40020000000000L, 0x0L);
         case 105:
  -         return jjMoveStringLiteralDfa1_6(0x1000000000L, 0x0L);
  +         return jjMoveStringLiteralDfa1_6(0x10000000000L, 0x0L);
         case 110:
  -         return jjMoveStringLiteralDfa1_6(0x1000000000000L, 0x0L);
  +         return jjMoveStringLiteralDfa1_6(0x20000000000000L, 0x0L);
         case 112:
  -         return jjMoveStringLiteralDfa1_6(0x0L, 0x800000000L);
  +         return jjMoveStringLiteralDfa1_6(0x0L, 0x4000000000L);
         case 116:
  -         return jjMoveStringLiteralDfa1_6(0x0L, 0x200000000L);
  +         return jjMoveStringLiteralDfa1_6(0x0L, 0x1000000000L);
         case 117:
  -         return jjMoveStringLiteralDfa1_6(0x0L, 0x400000000L);
  +         return jjMoveStringLiteralDfa1_6(0x0L, 0x2000000000L);
  +      case 123:
  +         return jjStartNfaWithStates_6(0, 119, 46);
         default :
  -         return jjMoveNfa_6(11, 0);
  +         return jjMoveNfa_6(18, 0);
      }
   }
   private final int jjMoveStringLiteralDfa1_6(long active0, long active1)
  @@ -1828,21 +931,23 @@
      switch(curChar)
      {
         case 46:
  -         if ((active1 & 0x200000000000L) != 0L)
  -            return jjStopAtPos(1, 109);
  +         if ((active1 & 0x400000000000L) != 0L)
  +            return jjStopAtPos(1, 110);
            break;
         case 101:
  -         return jjMoveStringLiteralDfa2_6(active0, 0L, active1, 
0x200000000L);
  +         return jjMoveStringLiteralDfa2_6(active0, 0L, active1, 
0x1000000000L);
         case 108:
  -         return jjMoveStringLiteralDfa2_6(active0, 0x2000000000L, active1, 
0L);
  +         return jjMoveStringLiteralDfa2_6(active0, 0x20000000000L, active1, 
0L);
  +      case 109:
  +         return jjMoveStringLiteralDfa2_6(active0, 0x40000000000000L, 
active1, 0L);
         case 110:
  -         return jjMoveStringLiteralDfa2_6(active0, 0L, active1, 
0x400000000L);
  +         return jjMoveStringLiteralDfa2_6(active0, 0L, active1, 
0x2000000000L);
         case 111:
  -         return jjMoveStringLiteralDfa2_6(active0, 0x1000000000000L, 
active1, 0xc0000000L);
  +         return jjMoveStringLiteralDfa2_6(active0, 0x20000000000000L, 
active1, 0x600000000L);
         case 114:
  -         return jjMoveStringLiteralDfa2_6(active0, 0L, active1, 
0x800000000L);
  +         return jjMoveStringLiteralDfa2_6(active0, 0L, active1, 
0x4000000000L);
         case 116:
  -         return jjMoveStringLiteralDfa2_6(active0, 0x5000000000L, active1, 
0L);
  +         return jjMoveStringLiteralDfa2_6(active0, 0x50000000000L, active1, 
0L);
         default :
            break;
      }
  @@ -1860,19 +965,21 @@
      switch(curChar)
      {
         case 99:
  -         return jjMoveStringLiteralDfa3_6(active0, 0L, active1, 0x80000000L);
  +         return jjMoveStringLiteralDfa3_6(active0, 0L, active1, 
0x400000000L);
         case 100:
  -         return jjMoveStringLiteralDfa3_6(active0, 0x1000000000000L, 
active1, 0L);
  +         return jjMoveStringLiteralDfa3_6(active0, 0x20000000000000L, 
active1, 0L);
         case 101:
  -         return jjMoveStringLiteralDfa3_6(active0, 0x3000000000L, active1, 
0L);
  +         return jjMoveStringLiteralDfa3_6(active0, 0x30000000000L, active1, 
0L);
         case 109:
  -         return jjMoveStringLiteralDfa3_6(active0, 0L, active1, 0x40000000L);
  +         return jjMoveStringLiteralDfa3_6(active0, 0L, active1, 
0x200000000L);
         case 111:
  -         return jjMoveStringLiteralDfa3_6(active0, 0L, active1, 
0x800000000L);
  +         return jjMoveStringLiteralDfa3_6(active0, 0L, active1, 
0x4000000000L);
  +      case 112:
  +         return jjMoveStringLiteralDfa3_6(active0, 0x40000000000000L, 
active1, 0L);
         case 116:
  -         return jjMoveStringLiteralDfa3_6(active0, 0x4000000000L, active1, 
0x400000000L);
  +         return jjMoveStringLiteralDfa3_6(active0, 0x40000000000L, active1, 
0x2000000000L);
         case 120:
  -         return jjMoveStringLiteralDfa3_6(active0, 0L, active1, 
0x200000000L);
  +         return jjMoveStringLiteralDfa3_6(active0, 0L, active1, 
0x1000000000L);
         default :
            break;
      }
  @@ -1890,25 +997,25 @@
      switch(curChar)
      {
         case 99:
  -         return jjMoveStringLiteralDfa4_6(active0, 0L, active1, 
0x800000000L);
  +         return jjMoveStringLiteralDfa4_6(active0, 0L, active1, 
0x4000000000L);
         case 101:
  -         if ((active0 & 0x1000000000000L) != 0L)
  -            return jjStartNfaWithStates_6(3, 48, 27);
  +         if ((active0 & 0x20000000000000L) != 0L)
  +            return jjStartNfaWithStates_6(3, 53, 65);
            break;
         case 109:
  -         if ((active0 & 0x1000000000L) != 0L)
  -            return jjStartNfaWithStates_6(3, 36, 27);
  -         return jjMoveStringLiteralDfa4_6(active0, 0x2000000000L, active1, 
0x40000000L);
  +         if ((active0 & 0x10000000000L) != 0L)
  +            return jjStartNfaWithStates_6(3, 40, 65);
  +         return jjMoveStringLiteralDfa4_6(active0, 0x20000000000L, active1, 
0x200000000L);
         case 114:
  -         return jjMoveStringLiteralDfa4_6(active0, 0x4000000000L, active1, 
0L);
  +         return jjMoveStringLiteralDfa4_6(active0, 0x40000000000L, active1, 
0L);
         case 116:
  -         if ((active1 & 0x200000000L) != 0L)
  -            return jjStartNfaWithStates_6(3, 97, 27);
  -         break;
  +         if ((active1 & 0x1000000000L) != 0L)
  +            return jjStartNfaWithStates_6(3, 100, 65);
  +         return jjMoveStringLiteralDfa4_6(active0, 0x40000000000000L, 
active1, 0L);
         case 117:
  -         return jjMoveStringLiteralDfa4_6(active0, 0L, active1, 0x80000000L);
  -      case 121:
            return jjMoveStringLiteralDfa4_6(active0, 0L, active1, 
0x400000000L);
  +      case 121:
  +         return jjMoveStringLiteralDfa4_6(active0, 0L, active1, 
0x2000000000L);
         default :
            break;
      }
  @@ -1926,13 +1033,17 @@
      switch(curChar)
      {
         case 101:
  -         return jjMoveStringLiteralDfa5_6(active0, 0x2000000000L, active1, 
0x840000000L);
  +         return jjMoveStringLiteralDfa5_6(active0, 0x20000000000L, active1, 
0x4200000000L);
         case 105:
  -         return jjMoveStringLiteralDfa5_6(active0, 0x4000000000L, active1, 
0L);
  +         return jjMoveStringLiteralDfa5_6(active0, 0x40000000000L, active1, 
0L);
         case 109:
  -         return jjMoveStringLiteralDfa5_6(active0, 0L, active1, 0x80000000L);
  -      case 112:
            return jjMoveStringLiteralDfa5_6(active0, 0L, active1, 
0x400000000L);
  +      case 112:
  +         return jjMoveStringLiteralDfa5_6(active0, 0L, active1, 
0x2000000000L);
  +      case 121:
  +         if ((active0 & 0x40000000000000L) != 0L)
  +            return jjStartNfaWithStates_6(4, 54, 65);
  +         break;
         default :
            break;
      }
  @@ -1940,345 +1051,1403 @@
   }
   private final int jjMoveStringLiteralDfa5_6(long old0, long active0, long 
old1, long active1)
   {
  -   if (((active0 &= old0) | (active1 &= old1)) == 0L)
  -      return jjStartNfa_6(3, old0, old1); 
  +   if (((active0 &= old0) | (active1 &= old1)) == 0L)
  +      return jjStartNfa_6(3, old0, old1); 
  +   try { curChar = input_stream.readChar(); }
  +   catch(java.io.IOException e) {
  +      jjStopStringLiteralDfa_6(4, active0, active1);
  +      return 5;
  +   }
  +   switch(curChar)
  +   {
  +      case 98:
  +         return jjMoveStringLiteralDfa6_6(active0, 0x40000000000L, active1, 
0L);
  +      case 101:
  +         return jjMoveStringLiteralDfa6_6(active0, 0L, active1, 
0x2400000000L);
  +      case 110:
  +         return jjMoveStringLiteralDfa6_6(active0, 0x20000000000L, active1, 
0x200000000L);
  +      case 115:
  +         return jjMoveStringLiteralDfa6_6(active0, 0L, active1, 
0x4000000000L);
  +      default :
  +         break;
  +   }
  +   return jjStartNfa_6(4, active0, active1);
  +}
  +private final int jjMoveStringLiteralDfa6_6(long old0, long active0, long 
old1, long active1)
  +{
  +   if (((active0 &= old0) | (active1 &= old1)) == 0L)
  +      return jjStartNfa_6(4, old0, old1); 
  +   try { curChar = input_stream.readChar(); }
  +   catch(java.io.IOException e) {
  +      jjStopStringLiteralDfa_6(5, active0, active1);
  +      return 6;
  +   }
  +   switch(curChar)
  +   {
  +      case 100:
  +         if ((active1 & 0x2000000000L) != 0L)
  +            return jjStartNfaWithStates_6(6, 101, 65);
  +         break;
  +      case 110:
  +         return jjMoveStringLiteralDfa7_6(active0, 0L, active1, 
0x400000000L);
  +      case 115:
  +         return jjMoveStringLiteralDfa7_6(active0, 0L, active1, 
0x4000000000L);
  +      case 116:
  +         if ((active0 & 0x20000000000L) != 0L)
  +            return jjStartNfaWithStates_6(6, 41, 65);
  +         else if ((active1 & 0x200000000L) != 0L)
  +            return jjStartNfaWithStates_6(6, 97, 65);
  +         break;
  +      case 117:
  +         return jjMoveStringLiteralDfa7_6(active0, 0x40000000000L, active1, 
0L);
  +      default :
  +         break;
  +   }
  +   return jjStartNfa_6(5, active0, active1);
  +}
  +private final int jjMoveStringLiteralDfa7_6(long old0, long active0, long 
old1, long active1)
  +{
  +   if (((active0 &= old0) | (active1 &= old1)) == 0L)
  +      return jjStartNfa_6(5, old0, old1); 
  +   try { curChar = input_stream.readChar(); }
  +   catch(java.io.IOException e) {
  +      jjStopStringLiteralDfa_6(6, active0, active1);
  +      return 7;
  +   }
  +   switch(curChar)
  +   {
  +      case 105:
  +         return jjMoveStringLiteralDfa8_6(active0, 0L, active1, 
0x4000000000L);
  +      case 116:
  +         if ((active1 & 0x400000000L) != 0L)
  +            return jjStartNfaWithStates_6(7, 98, 65);
  +         return jjMoveStringLiteralDfa8_6(active0, 0x40000000000L, active1, 
0L);
  +      default :
  +         break;
  +   }
  +   return jjStartNfa_6(6, active0, active1);
  +}
  +private final int jjMoveStringLiteralDfa8_6(long old0, long active0, long 
old1, long active1)
  +{
  +   if (((active0 &= old0) | (active1 &= old1)) == 0L)
  +      return jjStartNfa_6(6, old0, old1); 
  +   try { curChar = input_stream.readChar(); }
  +   catch(java.io.IOException e) {
  +      jjStopStringLiteralDfa_6(7, active0, active1);
  +      return 8;
  +   }
  +   switch(curChar)
  +   {
  +      case 101:
  +         if ((active0 & 0x40000000000L) != 0L)
  +            return jjStartNfaWithStates_6(8, 42, 65);
  +         break;
  +      case 110:
  +         return jjMoveStringLiteralDfa9_6(active0, 0L, active1, 
0x4000000000L);
  +      default :
  +         break;
  +   }
  +   return jjStartNfa_6(7, active0, active1);
  +}
  +private final int jjMoveStringLiteralDfa9_6(long old0, long active0, long 
old1, long active1)
  +{
  +   if (((active0 &= old0) | (active1 &= old1)) == 0L)
  +      return jjStartNfa_6(7, old0, old1); 
  +   try { curChar = input_stream.readChar(); }
  +   catch(java.io.IOException e) {
  +      jjStopStringLiteralDfa_6(8, 0L, active1);
  +      return 9;
  +   }
  +   switch(curChar)
  +   {
  +      case 103:
  +         return jjMoveStringLiteralDfa10_6(active1, 0x4000000000L);
  +      default :
  +         break;
  +   }
  +   return jjStartNfa_6(8, 0L, active1);
  +}
  +private final int jjMoveStringLiteralDfa10_6(long old1, long active1)
  +{
  +   if (((active1 &= old1)) == 0L)
  +      return jjStartNfa_6(8, 0L, old1); 
  +   try { curChar = input_stream.readChar(); }
  +   catch(java.io.IOException e) {
  +      jjStopStringLiteralDfa_6(9, 0L, active1);
  +      return 10;
  +   }
  +   switch(curChar)
  +   {
  +      case 45:
  +         return jjMoveStringLiteralDfa11_6(active1, 0x4000000000L);
  +      default :
  +         break;
  +   }
  +   return jjStartNfa_6(9, 0L, active1);
  +}
  +private final int jjMoveStringLiteralDfa11_6(long old1, long active1)
  +{
  +   if (((active1 &= old1)) == 0L)
  +      return jjStartNfa_6(9, 0L, old1); 
  +   try { curChar = input_stream.readChar(); }
  +   catch(java.io.IOException e) {
  +      jjStopStringLiteralDfa_6(10, 0L, active1);
  +      return 11;
  +   }
  +   switch(curChar)
  +   {
  +      case 105:
  +         return jjMoveStringLiteralDfa12_6(active1, 0x4000000000L);
  +      default :
  +         break;
  +   }
  +   return jjStartNfa_6(10, 0L, active1);
  +}
  +private final int jjMoveStringLiteralDfa12_6(long old1, long active1)
  +{
  +   if (((active1 &= old1)) == 0L)
  +      return jjStartNfa_6(10, 0L, old1); 
  +   try { curChar = input_stream.readChar(); }
  +   catch(java.io.IOException e) {
  +      jjStopStringLiteralDfa_6(11, 0L, active1);
  +      return 12;
  +   }
  +   switch(curChar)
  +   {
  +      case 110:
  +         return jjMoveStringLiteralDfa13_6(active1, 0x4000000000L);
  +      default :
  +         break;
  +   }
  +   return jjStartNfa_6(11, 0L, active1);
  +}
  +private final int jjMoveStringLiteralDfa13_6(long old1, long active1)
  +{
  +   if (((active1 &= old1)) == 0L)
  +      return jjStartNfa_6(11, 0L, old1); 
  +   try { curChar = input_stream.readChar(); }
  +   catch(java.io.IOException e) {
  +      jjStopStringLiteralDfa_6(12, 0L, active1);
  +      return 13;
  +   }
  +   switch(curChar)
  +   {
  +      case 115:
  +         return jjMoveStringLiteralDfa14_6(active1, 0x4000000000L);
  +      default :
  +         break;
  +   }
  +   return jjStartNfa_6(12, 0L, active1);
  +}
  +private final int jjMoveStringLiteralDfa14_6(long old1, long active1)
  +{
  +   if (((active1 &= old1)) == 0L)
  +      return jjStartNfa_6(12, 0L, old1); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_6(4, active0, active1);
  -      return 5;
  +      jjStopStringLiteralDfa_6(13, 0L, active1);
  +      return 14;
      }
      switch(curChar)
      {
  -      case 98:
  -         return jjMoveStringLiteralDfa6_6(active0, 0x4000000000L, active1, 
0L);
  -      case 101:
  -         return jjMoveStringLiteralDfa6_6(active0, 0L, active1, 
0x480000000L);
  -      case 110:
  -         return jjMoveStringLiteralDfa6_6(active0, 0x2000000000L, active1, 
0x40000000L);
  -      case 115:
  -         return jjMoveStringLiteralDfa6_6(active0, 0L, active1, 
0x800000000L);
  +      case 116:
  +         return jjMoveStringLiteralDfa15_6(active1, 0x4000000000L);
         default :
            break;
      }
  -   return jjStartNfa_6(4, active0, active1);
  +   return jjStartNfa_6(13, 0L, active1);
   }
  -private final int jjMoveStringLiteralDfa6_6(long old0, long active0, long 
old1, long active1)
  +private final int jjMoveStringLiteralDfa15_6(long old1, long active1)
   {
  -   if (((active0 &= old0) | (active1 &= old1)) == 0L)
  -      return jjStartNfa_6(4, old0, old1); 
  +   if (((active1 &= old1)) == 0L)
  +      return jjStartNfa_6(13, 0L, old1); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_6(5, active0, active1);
  -      return 6;
  +      jjStopStringLiteralDfa_6(14, 0L, active1);
  +      return 15;
      }
      switch(curChar)
      {
  -      case 100:
  -         if ((active1 & 0x400000000L) != 0L)
  -            return jjStartNfaWithStates_6(6, 98, 27);
  -         break;
  -      case 110:
  -         return jjMoveStringLiteralDfa7_6(active0, 0L, active1, 0x80000000L);
  -      case 115:
  -         return jjMoveStringLiteralDfa7_6(active0, 0L, active1, 
0x800000000L);
  -      case 116:
  -         if ((active0 & 0x2000000000L) != 0L)
  -            return jjStartNfaWithStates_6(6, 37, 27);
  -         else if ((active1 & 0x40000000L) != 0L)
  -            return jjStartNfaWithStates_6(6, 94, 27);
  -         break;
  -      case 117:
  -         return jjMoveStringLiteralDfa7_6(active0, 0x4000000000L, active1, 
0L);
  +      case 114:
  +         return jjMoveStringLiteralDfa16_6(active1, 0x4000000000L);
         default :
            break;
      }
  -   return jjStartNfa_6(5, active0, active1);
  +   return jjStartNfa_6(14, 0L, active1);
   }
  -private final int jjMoveStringLiteralDfa7_6(long old0, long active0, long 
old1, long active1)
  +private final int jjMoveStringLiteralDfa16_6(long old1, long active1)
   {
  -   if (((active0 &= old0) | (active1 &= old1)) == 0L)
  -      return jjStartNfa_6(5, old0, old1); 
  +   if (((active1 &= old1)) == 0L)
  +      return jjStartNfa_6(14, 0L, old1); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_6(6, active0, active1);
  -      return 7;
  +      jjStopStringLiteralDfa_6(15, 0L, active1);
  +      return 16;
      }
      switch(curChar)
      {
  -      case 105:
  -         return jjMoveStringLiteralDfa8_6(active0, 0L, active1, 
0x800000000L);
  -      case 116:
  -         if ((active1 & 0x80000000L) != 0L)
  -            return jjStartNfaWithStates_6(7, 95, 27);
  -         return jjMoveStringLiteralDfa8_6(active0, 0x4000000000L, active1, 
0L);
  +      case 117:
  +         return jjMoveStringLiteralDfa17_6(active1, 0x4000000000L);
         default :
            break;
      }
  -   return jjStartNfa_6(6, active0, active1);
  +   return jjStartNfa_6(15, 0L, active1);
   }
  -private final int jjMoveStringLiteralDfa8_6(long old0, long active0, long 
old1, long active1)
  +private final int jjMoveStringLiteralDfa17_6(long old1, long active1)
   {
  -   if (((active0 &= old0) | (active1 &= old1)) == 0L)
  -      return jjStartNfa_6(6, old0, old1); 
  +   if (((active1 &= old1)) == 0L)
  +      return jjStartNfa_6(15, 0L, old1); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_6(7, active0, active1);
  -      return 8;
  +      jjStopStringLiteralDfa_6(16, 0L, active1);
  +      return 17;
      }
      switch(curChar)
      {
  -      case 101:
  -         if ((active0 & 0x4000000000L) != 0L)
  -            return jjStartNfaWithStates_6(8, 38, 27);
  -         break;
  -      case 110:
  -         return jjMoveStringLiteralDfa9_6(active0, 0L, active1, 
0x800000000L);
  +      case 99:
  +         return jjMoveStringLiteralDfa18_6(active1, 0x4000000000L);
         default :
            break;
      }
  -   return jjStartNfa_6(7, active0, active1);
  +   return jjStartNfa_6(16, 0L, active1);
   }
  -private final int jjMoveStringLiteralDfa9_6(long old0, long active0, long 
old1, long active1)
  +private final int jjMoveStringLiteralDfa18_6(long old1, long active1)
   {
  -   if (((active0 &= old0) | (active1 &= old1)) == 0L)
  -      return jjStartNfa_6(7, old0, old1); 
  +   if (((active1 &= old1)) == 0L)
  +      return jjStartNfa_6(16, 0L, old1); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_6(8, 0L, active1);
  -      return 9;
  +      jjStopStringLiteralDfa_6(17, 0L, active1);
  +      return 18;
      }
      switch(curChar)
      {
  -      case 103:
  -         return jjMoveStringLiteralDfa10_6(active1, 0x800000000L);
  +      case 116:
  +         return jjMoveStringLiteralDfa19_6(active1, 0x4000000000L);
         default :
            break;
      }
  -   return jjStartNfa_6(8, 0L, active1);
  +   return jjStartNfa_6(17, 0L, active1);
   }
  -private final int jjMoveStringLiteralDfa10_6(long old1, long active1)
  +private final int jjMoveStringLiteralDfa19_6(long old1, long active1)
   {
      if (((active1 &= old1)) == 0L)
  -      return jjStartNfa_6(8, 0L, old1); 
  +      return jjStartNfa_6(17, 0L, old1); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_6(9, 0L, active1);
  -      return 10;
  +      jjStopStringLiteralDfa_6(18, 0L, active1);
  +      return 19;
      }
      switch(curChar)
      {
  -      case 45:
  -         return jjMoveStringLiteralDfa11_6(active1, 0x800000000L);
  +      case 105:
  +         return jjMoveStringLiteralDfa20_6(active1, 0x4000000000L);
         default :
            break;
      }
  -   return jjStartNfa_6(9, 0L, active1);
  +   return jjStartNfa_6(18, 0L, active1);
   }
  -private final int jjMoveStringLiteralDfa11_6(long old1, long active1)
  +private final int jjMoveStringLiteralDfa20_6(long old1, long active1)
   {
      if (((active1 &= old1)) == 0L)
  -      return jjStartNfa_6(9, 0L, old1); 
  +      return jjStartNfa_6(18, 0L, old1); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_6(10, 0L, active1);
  -      return 11;
  +      jjStopStringLiteralDfa_6(19, 0L, active1);
  +      return 20;
      }
      switch(curChar)
      {
  -      case 105:
  -         return jjMoveStringLiteralDfa12_6(active1, 0x800000000L);
  +      case 111:
  +         return jjMoveStringLiteralDfa21_6(active1, 0x4000000000L);
         default :
            break;
      }
  -   return jjStartNfa_6(10, 0L, active1);
  +   return jjStartNfa_6(19, 0L, active1);
   }
  -private final int jjMoveStringLiteralDfa12_6(long old1, long active1)
  +private final int jjMoveStringLiteralDfa21_6(long old1, long active1)
   {
      if (((active1 &= old1)) == 0L)
  -      return jjStartNfa_6(10, 0L, old1); 
  +      return jjStartNfa_6(19, 0L, old1); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_6(11, 0L, active1);
  -      return 12;
  +      jjStopStringLiteralDfa_6(20, 0L, active1);
  +      return 21;
      }
      switch(curChar)
      {
         case 110:
  -         return jjMoveStringLiteralDfa13_6(active1, 0x800000000L);
  +         if ((active1 & 0x4000000000L) != 0L)
  +            return jjStartNfaWithStates_6(21, 102, 65);
  +         break;
         default :
            break;
      }
  -   return jjStartNfa_6(11, 0L, active1);
  +   return jjStartNfa_6(20, 0L, active1);
  +}
  +static final long[] jjbitVec4 = {
  +   0x0L, 0xffffffffffffc000L, 0xfffff0007fffffffL, 0x7fffffL
  +};
  +static final long[] jjbitVec5 = {
  +   0x0L, 0x0L, 0x0L, 0xff7fffffff7fffffL
  +};
  +static final long[] jjbitVec6 = {
  +   0x7ff3ffffffffffffL, 0x7ffffffffffffdfeL, 0xffffffffffffffffL, 
0xfc31ffffffffe00fL
  +};
  +static final long[] jjbitVec7 = {
  +   0xffffffL, 0xffffffffffff0000L, 0xf80001ffffffffffL, 0x3L
  +};
  +static final long[] jjbitVec8 = {
  +   0x0L, 0x0L, 0xfffffffbffffd740L, 0xffffd547f7fffL
  +};
  +static final long[] jjbitVec9 = {
  +   0xffffffffffffdffeL, 0xffffffffdffeffffL, 0xffffffffffff0003L, 
0x33fcfffffff199fL
  +};
  +static final long[] jjbitVec10 = {
  +   0xfffe000000000000L, 0xfffffffe027fffffL, 0x7fL, 0x707ffffff0000L
  +};
  +static final long[] jjbitVec11 = {
  +   0x7fffffe00000000L, 0xfffe0000000007feL, 0x7cffffffffffffffL, 
0x60002f7fffL
  +};
  +static final long[] jjbitVec12 = {
  +   0x23ffffffffffffe0L, 0x3ff000000L, 0x3c5fdfffff99fe0L, 0x30003b0000000L
  +};
  +static final long[] jjbitVec13 = {
  +   0x36dfdfffff987e0L, 0x1c00005e000000L, 0x23edfdfffffbafe0L, 0x100000000L
  +};
  +static final long[] jjbitVec14 = {
  +   0x23cdfdfffff99fe0L, 0x3b0000000L, 0x3bfc718d63dc7e0L, 0x0L
  +};
  +static final long[] jjbitVec15 = {
  +   0x3effdfffffddfe0L, 0x300000000L, 0x3effdfffffddfe0L, 0x340000000L
  +};
  +static final long[] jjbitVec16 = {
  +   0x3fffdfffffddfe0L, 0x300000000L, 0x0L, 0x0L
  +};
  +static final long[] jjbitVec17 = {
  +   0xd7ffffffffffeL, 0x3fL, 0x200d6caefef02596L, 0x1fL
  +};
  +static final long[] jjbitVec18 = {
  +   0x0L, 0x3fffffffeffL, 0x0L, 0x0L
  +};
  +static final long[] jjbitVec19 = {
  +   0x0L, 0x0L, 0xffffffff00000000L, 0x7fffffffff003fL
  +};
  +static final long[] jjbitVec20 = {
  +   0x500000000007daedL, 0x2c62ab82315001L, 0xf580c90040000000L, 
0x201080000000007L
  +};
  +static final long[] jjbitVec21 = {
  +   0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffff0fffffffL, 
0x3ffffffffffffffL
  +};
  +static final long[] jjbitVec22 = {
  +   0xffffffff3f3fffffL, 0x3fffffffaaff3f3fL, 0x5fdfffffffffffffL, 
0x1fdc1fff0fcf1fdcL
  +};
  +static final long[] jjbitVec23 = {
  +   0x4c4000000000L, 0x0L, 0x7L, 0x0L
  +};
  +static final long[] jjbitVec24 = {
  +   0x3fe00000080L, 0xfffffffffffffffeL, 0xfffffffe001fffffL, 
0x7ffffffffffffffL
  +};
  +static final long[] jjbitVec25 = {
  +   0x1fffffffffe0L, 0x0L, 0x0L, 0x0L
  +};
  +static final long[] jjbitVec26 = {
  +   0xffffffffffffffffL, 0xffffffffffffffffL, 0x3fffffffffL, 0x0L
  +};
  +static final long[] jjbitVec27 = {
  +   0xffffffffffffffffL, 0xffffffffffffffffL, 0xfffffffffL, 0x0L
  +};
  +static final long[] jjbitVec28 = {
  +   0x0L, 0x0L, 0x80000000000000L, 0xff7fffffff7fffffL
  +};
  +static final long[] jjbitVec29 = {
  +   0xffffffL, 0xffffffffffff0000L, 0xf80001ffffffffffL, 0x30003L
  +};
  +static final long[] jjbitVec30 = {
  +   0xffffffffffffffffL, 0x30000003fL, 0xfffffffbffffd7c0L, 0xffffd547f7fffL
  +};
  +static final long[] jjbitVec31 = {
  +   0xffffffffffffdffeL, 0xffffffffdffeffffL, 0xffffffffffff007bL, 
0x33fcfffffff199fL
  +};
  +static final long[] jjbitVec32 = {
  +   0xfffe000000000000L, 0xfffffffe027fffffL, 0xbbfffffbfffe007fL, 
0x707ffffff0016L
  +};
  +static final long[] jjbitVec33 = {
  +   0x7fffffe00000000L, 0xffff03ff0007ffffL, 0x7cffffffffffffffL, 
0x3ff3dffffef7fffL
  +};
  +static final long[] jjbitVec34 = {
  +   0xf3ffffffffffffeeL, 0xffcfff1e3fffL, 0xd3c5fdfffff99feeL, 
0x3ffcfb080399fL
  +};
  +static final long[] jjbitVec35 = {
  +   0xd36dfdfffff987e4L, 0x1fffc05e003987L, 0xf3edfdfffffbafeeL, 
0xffc100003bbfL
  +};
  +static final long[] jjbitVec36 = {
  +   0xf3cdfdfffff99feeL, 0xffc3b0c0398fL, 0xc3bfc718d63dc7ecL, 0xff8000803dc7L
  +};
  +static final long[] jjbitVec37 = {
  +   0xc3effdfffffddfeeL, 0xffc300603ddfL, 0xc3effdfffffddfecL, 0xffc340603ddfL
  +};
  +static final long[] jjbitVec38 = {
  +   0xc3fffdfffffddfecL, 0xffc300803dcfL, 0x0L, 0x0L
  +};
  +static final long[] jjbitVec39 = {
  +   0x7ff7ffffffffffeL, 0x3ff7fffL, 0x3bff6caefef02596L, 0x3ff3f5fL
  +};
  +static final long[] jjbitVec40 = {
  +   0xc2a003ff03000000L, 0xfffe03fffffffeffL, 0x2fe3ffffebf0fdfL, 0x0L
  +};
  +static final long[] jjbitVec41 = {
  +   0x0L, 0x0L, 0x0L, 0x21fff0000L
  +};
  +static final long[] jjbitVec42 = {
  +   0x3efffe000000a0L, 0xfffffffffffffffeL, 0xfffffffe661fffffL, 
0x77ffffffffffffffL
  +};
  +private final int jjMoveNfa_6(int startState, int curPos)
  +{
  +   int[] nextStates;
  +   int startsAt = 0;
  +   jjnewStateCnt = 65;
  +   int i = 1;
  +   jjstateSet[0] = startState;
  +   int j, kind = 0x7fffffff;
  +   for (;;)
  +   {
  +      if (++jjround == 0x7fffffff)
  +         ReInitRounds();
  +      if (curChar < 64)
  +      {
  +         long l = 1L << curChar;
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 65:
  +                  if ((0x3ff600000000000L & l) != 0L)
  +                  {
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(64);
  +                  }
  +                  else if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 63;
  +                  if ((0x3ff600000000000L & l) != 0L)
  +                     jjCheckNAddTwoStates(61, 62);
  +                  else if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 60;
  +                  if ((0x3ff600000000000L & l) != 0L)
  +                     jjCheckNAddTwoStates(58, 59);
  +                  break;
  +               case 17:
  +                  if ((0x3ff600000000000L & l) != 0L)
  +                  {
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(64);
  +                  }
  +                  else if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 63;
  +                  if ((0x3ff600000000000L & l) != 0L)
  +                     jjCheckNAddTwoStates(61, 62);
  +                  else if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 60;
  +                  if ((0x3ff600000000000L & l) != 0L)
  +                     jjCheckNAddTwoStates(58, 59);
  +                  break;
  +               case 18:
  +                  if ((0x100002600L & l) != 0L)
  +                  {
  +                     if (kind > 6)
  +                        kind = 6;
  +                     jjCheckNAddStates(15, 17);
  +                  }
  +                  else if (curChar == 42)
  +                     jjstateSet[jjnewStateCnt++] = 20;
  +                  break;
  +               case 16:
  +                  if ((0x3ff600000000000L & l) != 0L)
  +                  {
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(64);
  +                  }
  +                  else if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 63;
  +                  if ((0x3ff600000000000L & l) != 0L)
  +                     jjCheckNAddTwoStates(61, 62);
  +                  else if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 60;
  +                  if ((0x3ff600000000000L & l) != 0L)
  +                     jjCheckNAddTwoStates(58, 59);
  +                  break;
  +               case 46:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 47;
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 41;
  +                  break;
  +               case 1:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(18, 20);
  +                  break;
  +               case 2:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(3, 13);
  +                  break;
  +               case 3:
  +                  jjCheckNAddTwoStates(3, 13);
  +                  break;
  +               case 5:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 2;
  +                  break;
  +               case 12:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 4;
  +                  break;
  +               case 13:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 12;
  +                  break;
  +               case 19:
  +                  if (curChar == 42)
  +                     jjstateSet[jjnewStateCnt++] = 20;
  +                  break;
  +               case 20:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 21;
  +                  break;
  +               case 22:
  +                  if ((0x3ff600000000000L & l) == 0L)
  +                     break;
  +                  if (kind > 59)
  +                     kind = 59;
  +                  jjstateSet[jjnewStateCnt++] = 22;
  +                  break;
  +               case 24:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(21, 23);
  +                  break;
  +               case 25:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(26, 32);
  +                  break;
  +               case 26:
  +                  jjCheckNAddTwoStates(26, 32);
  +                  break;
  +               case 28:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 25;
  +                  break;
  +               case 31:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 27;
  +                  break;
  +               case 32:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 31;
  +                  break;
  +               case 41:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(42, 45);
  +                  break;
  +               case 42:
  +                  jjCheckNAddTwoStates(42, 45);
  +                  break;
  +               case 44:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 43;
  +                  break;
  +               case 45:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 44;
  +                  break;
  +               case 47:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(48, 54);
  +                  break;
  +               case 48:
  +                  jjCheckNAddTwoStates(48, 54);
  +                  break;
  +               case 50:
  +                  if ((0x100002600L & l) == 0L)
  +                     break;
  +                  if (kind > 6)
  +                     kind = 6;
  +                  jjCheckNAddTwoStates(50, 52);
  +                  break;
  +               case 51:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 47;
  +                  break;
  +               case 53:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 49;
  +                  break;
  +               case 54:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 53;
  +                  break;
  +               case 55:
  +                  if ((0x100002600L & l) == 0L)
  +                     break;
  +                  if (kind > 6)
  +                     kind = 6;
  +                  jjCheckNAddStates(15, 17);
  +                  break;
  +               case 56:
  +                  if ((0x100002600L & l) == 0L)
  +                     break;
  +                  if (kind > 8)
  +                     kind = 8;
  +                  jjCheckNAdd(56);
  +                  break;
  +               case 58:
  +                  if ((0x3ff600000000000L & l) != 0L)
  +                     jjCheckNAddTwoStates(58, 59);
  +                  break;
  +               case 59:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 60;
  +                  break;
  +               case 60:
  +                  if (curChar == 42 && kind > 58)
  +                     kind = 58;
  +                  break;
  +               case 61:
  +                  if ((0x3ff600000000000L & l) != 0L)
  +                     jjCheckNAddTwoStates(61, 62);
  +                  break;
  +               case 62:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 63;
  +                  break;
  +               case 64:
  +                  if ((0x3ff600000000000L & l) == 0L)
  +                     break;
  +                  if (kind > 116)
  +                     kind = 116;
  +                  jjCheckNAdd(64);
  +                  break;
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      else if (curChar < 128)
  +      {
  +         long l = 1L << (curChar & 077);
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 65:
  +                  if ((0x7fffffe87fffffeL & l) != 0L)
  +                  {
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(64);
  +                  }
  +                  if ((0x7fffffe87fffffeL & l) != 0L)
  +                     jjCheckNAddTwoStates(61, 62);
  +                  if ((0x7fffffe87fffffeL & l) != 0L)
  +                     jjCheckNAddTwoStates(58, 59);
  +                  break;
  +               case 17:
  +                  if ((0x7fffffe87fffffeL & l) != 0L)
  +                  {
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(64);
  +                  }
  +                  if ((0x7fffffe87fffffeL & l) != 0L)
  +                     jjCheckNAddTwoStates(61, 62);
  +                  if ((0x7fffffe87fffffeL & l) != 0L)
  +                     jjCheckNAddTwoStates(58, 59);
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 16;
  +                  break;
  +               case 18:
  +                  if ((0x7fffffe87fffffeL & l) != 0L)
  +                  {
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAddStates(24, 28);
  +                  }
  +                  else if (curChar == 123)
  +                     jjCheckNAddTwoStates(46, 51);
  +                  if (curChar == 118)
  +                     jjstateSet[jjnewStateCnt++] = 38;
  +                  else if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 17;
  +                  break;
  +               case 16:
  +                  if ((0x7fffffe87fffffeL & l) != 0L)
  +                  {
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(64);
  +                  }
  +                  if ((0x7fffffe87fffffeL & l) != 0L)
  +                     jjCheckNAddTwoStates(61, 62);
  +                  if ((0x7fffffe87fffffeL & l) != 0L)
  +                     jjCheckNAddTwoStates(58, 59);
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 15;
  +                  break;
  +               case 0:
  +                  if (curChar == 99)
  +                     jjCheckNAddTwoStates(1, 6);
  +                  break;
  +               case 3:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(29, 30);
  +                  break;
  +               case 4:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(18, 20);
  +                  break;
  +               case 6:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 5;
  +                  break;
  +               case 7:
  +                  if (curChar == 101 && kind > 51)
  +                     kind = 51;
  +                  break;
  +               case 8:
  +                  if (curChar == 117)
  +                     jjstateSet[jjnewStateCnt++] = 7;
  +                  break;
  +               case 9:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 8;
  +                  break;
  +               case 10:
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 9;
  +                  break;
  +               case 11:
  +                  if (curChar == 118)
  +                     jjstateSet[jjnewStateCnt++] = 10;
  +                  break;
  +               case 14:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 0;
  +                  break;
  +               case 15:
  +                  if (curChar == 109)
  +                     jjstateSet[jjnewStateCnt++] = 14;
  +                  break;
  +               case 21:
  +               case 22:
  +                  if ((0x7fffffe87fffffeL & l) == 0L)
  +                     break;
  +                  if (kind > 59)
  +                     kind = 59;
  +                  jjCheckNAdd(22);
  +                  break;
  +               case 23:
  +                  if (curChar == 101)
  +                     jjCheckNAddStates(21, 23);
  +                  break;
  +               case 26:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(31, 32);
  +                  break;
  +               case 27:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(21, 23);
  +                  break;
  +               case 29:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 28;
  +                  break;
  +               case 30:
  +                  if (curChar == 123 && kind > 94)
  +                     kind = 94;
  +                  break;
  +               case 33:
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 23;
  +                  break;
  +               case 34:
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 33;
  +                  break;
  +               case 35:
  +                  if (curChar == 100)
  +                     jjstateSet[jjnewStateCnt++] = 34;
  +                  break;
  +               case 36:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 35;
  +                  break;
  +               case 37:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 36;
  +                  break;
  +               case 38:
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 37;
  +                  break;
  +               case 39:
  +                  if (curChar == 118)
  +                     jjstateSet[jjnewStateCnt++] = 38;
  +                  break;
  +               case 40:
  +                  if (curChar == 123)
  +                     jjCheckNAddTwoStates(46, 51);
  +                  break;
  +               case 42:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(33, 34);
  +                  break;
  +               case 43:
  +                  if (curChar == 125 && kind > 5)
  +                     kind = 5;
  +                  break;
  +               case 48:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(35, 36);
  +                  break;
  +               case 49:
  +                  if (curChar != 125)
  +                     break;
  +                  if (kind > 6)
  +                     kind = 6;
  +                  jjAddStates(37, 38);
  +                  break;
  +               case 52:
  +                  if (curChar == 123)
  +                     jjCheckNAdd(51);
  +                  break;
  +               case 57:
  +                  if ((0x7fffffe87fffffeL & l) == 0L)
  +                     break;
  +                  if (kind > 116)
  +                     kind = 116;
  +                  jjCheckNAddStates(24, 28);
  +                  break;
  +               case 58:
  +                  if ((0x7fffffe87fffffeL & l) != 0L)
  +                     jjCheckNAddTwoStates(58, 59);
  +                  break;
  +               case 61:
  +                  if ((0x7fffffe87fffffeL & l) != 0L)
  +                     jjCheckNAddTwoStates(61, 62);
  +                  break;
  +               case 63:
  +                  if ((0x7fffffe87fffffeL & l) == 0L)
  +                     break;
  +                  if (kind > 116)
  +                     kind = 116;
  +                  jjCheckNAdd(64);
  +                  break;
  +               case 64:
  +                  if ((0x7fffffe87fffffeL & l) == 0L)
  +                     break;
  +                  if (kind > 116)
  +                     kind = 116;
  +                  jjCheckNAdd(64);
  +                  break;
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      else
  +      {
  +         int i2 = (curChar & 0xff) >> 6;
  +         long l2 = 1L << (curChar & 077);
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 65:
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                     jjCheckNAddTwoStates(58, 59);
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                     jjCheckNAddTwoStates(61, 62);
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                  {
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(64);
  +                  }
  +                  break;
  +               case 17:
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                     jjCheckNAddTwoStates(58, 59);
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                     jjCheckNAddTwoStates(61, 62);
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                  {
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(64);
  +                  }
  +                  break;
  +               case 18:
  +                  if ((jjbitVec5[i2] & l2) == 0L)
  +                     break;
  +                  if (kind > 116)
  +                     kind = 116;
  +                  jjCheckNAddStates(24, 28);
  +                  break;
  +               case 16:
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                     jjCheckNAddTwoStates(58, 59);
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                     jjCheckNAddTwoStates(61, 62);
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                  {
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(64);
  +                  }
  +                  break;
  +               case 3:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(29, 30);
  +                  break;
  +               case 21:
  +                  if ((jjbitVec5[i2] & l2) == 0L)
  +                     break;
  +                  if (kind > 59)
  +                     kind = 59;
  +                  jjCheckNAdd(22);
  +                  break;
  +               case 22:
  +                  if ((jjbitVec28[i2] & l2) == 0L)
  +                     break;
  +                  if (kind > 59)
  +                     kind = 59;
  +                  jjCheckNAdd(22);
  +                  break;
  +               case 26:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(31, 32);
  +                  break;
  +               case 42:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(33, 34);
  +                  break;
  +               case 48:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(35, 36);
  +                  break;
  +               case 58:
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                     jjCheckNAddTwoStates(58, 59);
  +                  break;
  +               case 61:
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                     jjCheckNAddTwoStates(61, 62);
  +                  break;
  +               case 63:
  +                  if ((jjbitVec5[i2] & l2) == 0L)
  +                     break;
  +                  if (kind > 116)
  +                     kind = 116;
  +                  jjCheckNAdd(64);
  +                  break;
  +               case 64:
  +                  if ((jjbitVec28[i2] & l2) == 0L)
  +                     break;
  +                  if (kind > 116)
  +                     kind = 116;
  +                  jjCheckNAdd(64);
  +                  break;
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      if (kind != 0x7fffffff)
  +      {
  +         jjmatchedKind = kind;
  +         jjmatchedPos = curPos;
  +         kind = 0x7fffffff;
  +      }
  +      ++curPos;
  +      if ((i = jjnewStateCnt) == (startsAt = 65 - (jjnewStateCnt = 
startsAt)))
  +         return curPos;
  +      try { curChar = input_stream.readChar(); }
  +      catch(java.io.IOException e) { return curPos; }
  +   }
   }
  -private final int jjMoveStringLiteralDfa13_6(long old1, long active1)
  +private final int jjMoveStringLiteralDfa0_7()
   {
  -   if (((active1 &= old1)) == 0L)
  -      return jjStartNfa_6(11, 0L, old1); 
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_6(12, 0L, active1);
  -      return 13;
  -   }
  -   switch(curChar)
  -   {
  -      case 115:
  -         return jjMoveStringLiteralDfa14_6(active1, 0x800000000L);
  -      default :
  -         break;
  -   }
  -   return jjStartNfa_6(12, 0L, active1);
  +   return jjMoveNfa_7(8, 0);
   }
  -private final int jjMoveStringLiteralDfa14_6(long old1, long active1)
  +private final int jjMoveNfa_7(int startState, int curPos)
   {
  -   if (((active1 &= old1)) == 0L)
  -      return jjStartNfa_6(12, 0L, old1); 
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_6(13, 0L, active1);
  -      return 14;
  -   }
  -   switch(curChar)
  +   int[] nextStates;
  +   int startsAt = 0;
  +   jjnewStateCnt = 20;
  +   int i = 1;
  +   jjstateSet[0] = startState;
  +   int j, kind = 0x7fffffff;
  +   for (;;)
      {
  -      case 116:
  -         return jjMoveStringLiteralDfa15_6(active1, 0x800000000L);
  -      default :
  -         break;
  +      if (++jjround == 0x7fffffff)
  +         ReInitRounds();
  +      if (curChar < 64)
  +      {
  +         long l = 1L << curChar;
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 8:
  +               case 0:
  +                  if ((0x100002600L & l) == 0L)
  +                     break;
  +                  if (kind > 6)
  +                     kind = 6;
  +                  jjCheckNAddTwoStates(0, 5);
  +                  break;
  +               case 1:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(2, 7);
  +                  break;
  +               case 2:
  +                  jjCheckNAddTwoStates(2, 7);
  +                  break;
  +               case 4:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 1;
  +                  break;
  +               case 6:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 3;
  +                  break;
  +               case 7:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 6;
  +                  break;
  +               case 9:
  +                  if ((0x3ff600000000000L & l) != 0L)
  +                     jjAddStates(39, 40);
  +                  break;
  +               case 10:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 11;
  +                  break;
  +               case 12:
  +                  if ((0x3ff600000000000L & l) == 0L)
  +                     break;
  +                  if (kind > 115)
  +                     kind = 115;
  +                  jjstateSet[jjnewStateCnt++] = 12;
  +                  break;
  +               case 14:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(15, 18);
  +                  break;
  +               case 15:
  +                  jjCheckNAddTwoStates(15, 18);
  +                  break;
  +               case 17:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 16;
  +                  break;
  +               case 18:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 17;
  +                  break;
  +               case 19:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 14;
  +                  break;
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      else if (curChar < 128)
  +      {
  +         long l = 1L << (curChar & 077);
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 8:
  +                  if ((0x7fffffe87fffffeL & l) != 0L)
  +                  {
  +                     if (kind > 115)
  +                        kind = 115;
  +                     jjCheckNAddStates(41, 43);
  +                  }
  +                  else if (curChar == 123)
  +                     jjCheckNAddTwoStates(19, 4);
  +                  break;
  +               case 2:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(0, 1);
  +                  break;
  +               case 3:
  +                  if (curChar != 125)
  +                     break;
  +                  if (kind > 6)
  +                     kind = 6;
  +                  jjAddStates(2, 3);
  +                  break;
  +               case 5:
  +                  if (curChar == 123)
  +                     jjCheckNAdd(4);
  +                  break;
  +               case 9:
  +                  if ((0x7fffffe87fffffeL & l) != 0L)
  +                     jjCheckNAddTwoStates(9, 10);
  +                  break;
  +               case 11:
  +               case 12:
  +                  if ((0x7fffffe87fffffeL & l) == 0L)
  +                     break;
  +                  if (kind > 115)
  +                     kind = 115;
  +                  jjCheckNAdd(12);
  +                  break;
  +               case 13:
  +                  if (curChar == 123)
  +                     jjCheckNAddTwoStates(19, 4);
  +                  break;
  +               case 15:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(44, 45);
  +                  break;
  +               case 16:
  +                  if (curChar == 125 && kind > 5)
  +                     kind = 5;
  +                  break;
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      else
  +      {
  +         int i2 = (curChar & 0xff) >> 6;
  +         long l2 = 1L << (curChar & 077);
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 8:
  +                  if ((jjbitVec5[i2] & l2) == 0L)
  +                     break;
  +                  if (kind > 115)
  +                     kind = 115;
  +                  jjCheckNAddStates(41, 43);
  +                  break;
  +               case 2:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(0, 1);
  +                  break;
  +               case 9:
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                     jjCheckNAddTwoStates(9, 10);
  +                  break;
  +               case 11:
  +                  if ((jjbitVec5[i2] & l2) == 0L)
  +                     break;
  +                  if (kind > 115)
  +                     kind = 115;
  +                  jjCheckNAdd(12);
  +                  break;
  +               case 12:
  +                  if ((jjbitVec28[i2] & l2) == 0L)
  +                     break;
  +                  if (kind > 115)
  +                     kind = 115;
  +                  jjCheckNAdd(12);
  +                  break;
  +               case 15:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(44, 45);
  +                  break;
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      if (kind != 0x7fffffff)
  +      {
  +         jjmatchedKind = kind;
  +         jjmatchedPos = curPos;
  +         kind = 0x7fffffff;
  +      }
  +      ++curPos;
  +      if ((i = jjnewStateCnt) == (startsAt = 20 - (jjnewStateCnt = 
startsAt)))
  +         return curPos;
  +      try { curChar = input_stream.readChar(); }
  +      catch(java.io.IOException e) { return curPos; }
      }
  -   return jjStartNfa_6(13, 0L, active1);
   }
  -private final int jjMoveStringLiteralDfa15_6(long old1, long active1)
  +private final int jjMoveStringLiteralDfa0_15()
   {
  -   if (((active1 &= old1)) == 0L)
  -      return jjStartNfa_6(13, 0L, old1); 
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_6(14, 0L, active1);
  -      return 15;
  -   }
  -   switch(curChar)
  -   {
  -      case 114:
  -         return jjMoveStringLiteralDfa16_6(active1, 0x800000000L);
  -      default :
  -         break;
  -   }
  -   return jjStartNfa_6(14, 0L, active1);
  +   return jjMoveNfa_15(0, 0);
   }
  -private final int jjMoveStringLiteralDfa16_6(long old1, long active1)
  +private final int jjMoveNfa_15(int startState, int curPos)
   {
  -   if (((active1 &= old1)) == 0L)
  -      return jjStartNfa_6(14, 0L, old1); 
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_6(15, 0L, active1);
  -      return 16;
  -   }
  -   switch(curChar)
  +   int[] nextStates;
  +   int startsAt = 0;
  +   jjnewStateCnt = 1;
  +   int i = 1;
  +   jjstateSet[0] = startState;
  +   int j, kind = 0x7fffffff;
  +   for (;;)
      {
  -      case 117:
  -         return jjMoveStringLiteralDfa17_6(active1, 0x800000000L);
  -      default :
  -         break;
  +      if (++jjround == 0x7fffffff)
  +         ReInitRounds();
  +      if (curChar < 64)
  +      {
  +         long l = 1L << curChar;
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 0:
  +                  if ((0xffffffff00002600L & l) != 0L)
  +                     kind = 121;
  +                  break;
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      else if (curChar < 128)
  +      {
  +         long l = 1L << (curChar & 077);
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 0:
  +                  kind = 121;
  +                  break;
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      else
  +      {
  +         int i2 = (curChar & 0xff) >> 6;
  +         long l2 = 1L << (curChar & 077);
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 0:
  +                  if ((jjbitVec0[i2] & l2) != 0L && kind > 121)
  +                     kind = 121;
  +                  break;
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      if (kind != 0x7fffffff)
  +      {
  +         jjmatchedKind = kind;
  +         jjmatchedPos = curPos;
  +         kind = 0x7fffffff;
  +      }
  +      ++curPos;
  +      if ((i = jjnewStateCnt) == (startsAt = 1 - (jjnewStateCnt = startsAt)))
  +         return curPos;
  +      try { curChar = input_stream.readChar(); }
  +      catch(java.io.IOException e) { return curPos; }
      }
  -   return jjStartNfa_6(15, 0L, active1);
   }
  -private final int jjMoveStringLiteralDfa17_6(long old1, long active1)
  +private final int jjStopStringLiteralDfa_0(int pos, long active0, long 
active1)
   {
  -   if (((active1 &= old1)) == 0L)
  -      return jjStartNfa_6(15, 0L, old1); 
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_6(16, 0L, active1);
  -      return 17;
  -   }
  -   switch(curChar)
  +   switch (pos)
      {
  -      case 99:
  -         return jjMoveStringLiteralDfa18_6(active1, 0x800000000L);
  +      case 0:
  +         if ((active1 & 0x80000000000000L) != 0L)
  +            return 55;
  +         if ((active0 & 0x200000000000000L) != 0L)
  +            return 21;
  +         if ((active1 & 0x600000000000L) != 0L)
  +            return 718;
  +         return -1;
         default :
  -         break;
  +         return -1;
      }
  -   return jjStartNfa_6(16, 0L, active1);
   }
  -private final int jjMoveStringLiteralDfa18_6(long old1, long active1)
  +private final int jjStartNfa_0(int pos, long active0, long active1)
   {
  -   if (((active1 &= old1)) == 0L)
  -      return jjStartNfa_6(16, 0L, old1); 
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_6(17, 0L, active1);
  -      return 18;
  -   }
  -   switch(curChar)
  -   {
  -      case 116:
  -         return jjMoveStringLiteralDfa19_6(active1, 0x800000000L);
  -      default :
  -         break;
  -   }
  -   return jjStartNfa_6(17, 0L, active1);
  +   return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0, active1), pos + 
1);
   }
  -private final int jjMoveStringLiteralDfa19_6(long old1, long active1)
  +private final int jjStartNfaWithStates_0(int pos, int kind, int state)
   {
  -   if (((active1 &= old1)) == 0L)
  -      return jjStartNfa_6(17, 0L, old1); 
  +   jjmatchedKind = kind;
  +   jjmatchedPos = pos;
      try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_6(18, 0L, active1);
  -      return 19;
  -   }
  -   switch(curChar)
  -   {
  -      case 105:
  -         return jjMoveStringLiteralDfa20_6(active1, 0x800000000L);
  -      default :
  -         break;
  -   }
  -   return jjStartNfa_6(18, 0L, active1);
  +   catch(java.io.IOException e) { return pos + 1; }
  +   return jjMoveNfa_0(state, pos + 1);
   }
  -private final int jjMoveStringLiteralDfa20_6(long old1, long active1)
  +private final int jjMoveStringLiteralDfa0_0()
   {
  -   if (((active1 &= old1)) == 0L)
  -      return jjStartNfa_6(18, 0L, old1); 
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_6(19, 0L, active1);
  -      return 20;
  -   }
      switch(curChar)
      {
  -      case 111:
  -         return jjMoveStringLiteralDfa21_6(active1, 0x800000000L);
  +      case 36:
  +         return jjStopAtPos(0, 114);
  +      case 40:
  +         return jjStopAtPos(0, 84);
  +      case 41:
  +         return jjStopAtPos(0, 88);
  +      case 42:
  +         return jjStartNfaWithStates_0(0, 57, 21);
  +      case 43:
  +         return jjStopAtPos(0, 81);
  +      case 44:
  +         return jjStopAtPos(0, 108);
  +      case 45:
  +         return jjStopAtPos(0, 80);
  +      case 46:
  +         jjmatchedKind = 109;
  +         return jjMoveStringLiteralDfa1_0(0x0L, 0x400000000000L);
  +      case 47:
  +         jjmatchedKind = 60;
  +         return jjMoveStringLiteralDfa1_0(0x2000000000000000L, 0x0L);
  +      case 63:
  +         return jjStopAtPos(0, 82);
  +      case 64:
  +         return jjStopAtPos(0, 85);
  +      case 91:
  +         return jjStopAtPos(0, 86);
  +      case 93:
  +         return jjStopAtPos(0, 87);
  +      case 123:
  +         return jjStartNfaWithStates_0(0, 119, 55);
  +      case 125:
  +         return jjStopAtPos(0, 120);
         default :
  -         break;
  +         return jjMoveNfa_0(19, 0);
      }
  -   return jjStartNfa_6(19, 0L, active1);
   }
  -private final int jjMoveStringLiteralDfa21_6(long old1, long active1)
  +private final int jjMoveStringLiteralDfa1_0(long active0, long active1)
   {
  -   if (((active1 &= old1)) == 0L)
  -      return jjStartNfa_6(19, 0L, old1); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_6(20, 0L, active1);
  -      return 21;
  +      jjStopStringLiteralDfa_0(0, active0, active1);
  +      return 1;
      }
      switch(curChar)
      {
  -      case 110:
  -         if ((active1 & 0x800000000L) != 0L)
  -            return jjStartNfaWithStates_6(21, 99, 27);
  +      case 46:
  +         if ((active1 & 0x400000000000L) != 0L)
  +            return jjStopAtPos(1, 110);
  +         break;
  +      case 47:
  +         if ((active0 & 0x2000000000000000L) != 0L)
  +            return jjStopAtPos(1, 61);
            break;
         default :
            break;
      }
  -   return jjStartNfa_6(20, 0L, active1);
  +   return jjStartNfa_0(0, active0, active1);
   }
  -private final int jjMoveNfa_6(int startState, int curPos)
  +private final int jjMoveNfa_0(int startState, int curPos)
   {
      int[] nextStates;
      int startsAt = 0;
  -   jjnewStateCnt = 27;
  +   jjnewStateCnt = 718;
      int i = 1;
      jjstateSet[0] = startState;
      int j, kind = 0x7fffffff;
  @@ -2288,265 +2457,3176 @@
            ReInitRounds();
         if (curChar < 64)
         {
  -         long l = 1L << curChar;
  +         long l = 1L << curChar;
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 55:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 56;
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 50;
  +                  break;
  +               case 19:
  +                  if ((0x3ff000000000000L & l) != 0L)
  +                  {
  +                     if (kind > 1)
  +                        kind = 1;
  +                     jjCheckNAddStates(46, 51);
  +                  }
  +                  else if ((0x100002600L & l) != 0L)
  +                  {
  +                     if (kind > 6)
  +                        kind = 6;
  +                     jjCheckNAddStates(52, 54);
  +                  }
  +                  else if (curChar == 46)
  +                     jjCheckNAddTwoStates(47, 48);
  +                  else if (curChar == 42)
  +                     jjstateSet[jjnewStateCnt++] = 21;
  +                  else if (curChar == 39)
  +                     jjCheckNAddTwoStates(4, 5);
  +                  else if (curChar == 34)
  +                     jjCheckNAddTwoStates(1, 2);
  +                  break;
  +               case 718:
  +                  if ((0x3ff000000000000L & l) != 0L)
  +                     jjCheckNAddTwoStates(48, 43);
  +                  if ((0x3ff000000000000L & l) != 0L)
  +                  {
  +                     if (kind > 2)
  +                        kind = 2;
  +                     jjCheckNAdd(47);
  +                  }
  +                  break;
  +               case 0:
  +                  if (curChar == 34)
  +                     jjCheckNAddTwoStates(1, 2);
  +                  break;
  +               case 1:
  +                  if ((0xfffffffbffffffffL & l) != 0L)
  +                     jjCheckNAddTwoStates(1, 2);
  +                  break;
  +               case 2:
  +                  if (curChar != 34)
  +                     break;
  +                  if (kind > 4)
  +                     kind = 4;
  +                  jjstateSet[jjnewStateCnt++] = 0;
  +                  break;
  +               case 3:
  +                  if (curChar == 39)
  +                     jjCheckNAddTwoStates(4, 5);
  +                  break;
  +               case 4:
  +                  if ((0xffffff7fffffffffL & l) != 0L)
  +                     jjCheckNAddTwoStates(4, 5);
  +                  break;
  +               case 5:
  +                  if (curChar != 39)
  +                     break;
  +                  if (kind > 4)
  +                     kind = 4;
  +                  jjstateSet[jjnewStateCnt++] = 3;
  +                  break;
  +               case 7:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(55, 57);
  +                  break;
  +               case 8:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(9, 18);
  +                  break;
  +               case 9:
  +                  jjCheckNAddTwoStates(9, 18);
  +                  break;
  +               case 11:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 8;
  +                  break;
  +               case 17:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 10;
  +                  break;
  +               case 18:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 17;
  +                  break;
  +               case 20:
  +                  if (curChar == 42)
  +                     jjstateSet[jjnewStateCnt++] = 21;
  +                  break;
  +               case 21:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 22;
  +                  break;
  +               case 23:
  +                  if ((0x3ff600000000000L & l) == 0L)
  +                     break;
  +                  if (kind > 59)
  +                     kind = 59;
  +                  jjstateSet[jjnewStateCnt++] = 23;
  +                  break;
  +               case 25:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(58, 60);
  +                  break;
  +               case 26:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(27, 33);
  +                  break;
  +               case 27:
  +                  jjCheckNAddTwoStates(27, 33);
  +                  break;
  +               case 29:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 26;
  +                  break;
  +               case 31:
  +                  if (curChar == 40 && kind > 107)
  +                     kind = 107;
  +                  break;
  +               case 32:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 28;
  +                  break;
  +               case 33:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 32;
  +                  break;
  +               case 35:
  +                  if ((0x3ff000000000000L & l) == 0L)
  +                     break;
  +                  if (kind > 1)
  +                     kind = 1;
  +                  jjCheckNAddStates(46, 51);
  +                  break;
  +               case 36:
  +                  if ((0x3ff000000000000L & l) == 0L)
  +                     break;
  +                  if (kind > 1)
  +                     kind = 1;
  +                  jjCheckNAdd(36);
  +                  break;
  +               case 37:
  +                  if ((0x3ff000000000000L & l) != 0L)
  +                     jjCheckNAddTwoStates(37, 38);
  +                  break;
  +               case 38:
  +                  if (curChar != 46)
  +                     break;
  +                  if (kind > 2)
  +                     kind = 2;
  +                  jjCheckNAdd(39);
  +                  break;
  +               case 39:
  +                  if ((0x3ff000000000000L & l) == 0L)
  +                     break;
  +                  if (kind > 2)
  +                     kind = 2;
  +                  jjCheckNAdd(39);
  +                  break;
  +               case 40:
  +                  if ((0x3ff000000000000L & l) != 0L)
  +                     jjCheckNAddStates(61, 63);
  +                  break;
  +               case 41:
  +                  if (curChar == 46)
  +                     jjCheckNAddTwoStates(42, 43);
  +                  break;
  +               case 42:
  +                  if ((0x3ff000000000000L & l) != 0L)
  +                     jjCheckNAddTwoStates(42, 43);
  +                  break;
  +               case 44:
  +                  if ((0x280000000000L & l) != 0L)
  +                     jjCheckNAdd(45);
  +                  break;
  +               case 45:
  +                  if ((0x3ff000000000000L & l) == 0L)
  +                     break;
  +                  if (kind > 3)
  +                     kind = 3;
  +                  jjCheckNAdd(45);
  +                  break;
  +               case 46:
  +                  if (curChar == 46)
  +                     jjCheckNAddTwoStates(47, 48);
  +                  break;
  +               case 47:
  +                  if ((0x3ff000000000000L & l) == 0L)
  +                     break;
  +                  if (kind > 2)
  +                     kind = 2;
  +                  jjCheckNAdd(47);
  +                  break;
  +               case 48:
  +                  if ((0x3ff000000000000L & l) != 0L)
  +                     jjCheckNAddTwoStates(48, 43);
  +                  break;
  +               case 50:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(51, 54);
  +                  break;
  +               case 51:
  +                  jjCheckNAddTwoStates(51, 54);
  +                  break;
  +               case 53:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 52;
  +                  break;
  +               case 54:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 53;
  +                  break;
  +               case 56:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(57, 63);
  +                  break;
  +               case 57:
  +                  jjCheckNAddTwoStates(57, 63);
  +                  break;
  +               case 59:
  +                  if ((0x100002600L & l) == 0L)
  +                     break;
  +                  if (kind > 6)
  +                     kind = 6;
  +                  jjCheckNAddTwoStates(59, 61);
  +                  break;
  +               case 60:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 56;
  +                  break;
  +               case 62:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 58;
  +                  break;
  +               case 63:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 62;
  +                  break;
  +               case 64:
  +                  if ((0x100002600L & l) == 0L)
  +                     break;
  +                  if (kind > 6)
  +                     kind = 6;
  +                  jjCheckNAddStates(52, 54);
  +                  break;
  +               case 65:
  +                  if ((0x100002600L & l) == 0L)
  +                     break;
  +                  if (kind > 8)
  +                     kind = 8;
  +                  jjCheckNAdd(65);
  +                  break;
  +               case 68:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(64, 66);
  +                  break;
  +               case 69:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(70, 77);
  +                  break;
  +               case 70:
  +                  jjCheckNAddTwoStates(70, 77);
  +                  break;
  +               case 72:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 69;
  +                  break;
  +               case 74:
  +                  if (curChar == 58 && kind > 9)
  +                     kind = 9;
  +                  break;
  +               case 75:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 74;
  +                  break;
  +               case 76:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 71;
  +                  break;
  +               case 77:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 76;
  +                  break;
  +               case 82:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(67, 69);
  +                  break;
  +               case 83:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(84, 91);
  +                  break;
  +               case 84:
  +                  jjCheckNAddTwoStates(84, 91);
  +                  break;
  +               case 86:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 83;
  +                  break;
  +               case 90:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 85;
  +                  break;
  +               case 91:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 90;
  +                  break;
  +               case 95:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(70, 72);
  +                  break;
  +               case 96:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(97, 103);
  +                  break;
  +               case 97:
  +                  jjCheckNAddTwoStates(97, 103);
  +                  break;
  +               case 99:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 96;
  +                  break;
  +               case 101:
  +                  if (curChar == 40 && kind > 104)
  +                     kind = 104;
  +                  break;
  +               case 102:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 98;
  +                  break;
  +               case 103:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 102;
  +                  break;
  +               case 111:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(73, 75);
  +                  break;
  +               case 112:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(113, 120);
  +                  break;
  +               case 113:
  +                  jjCheckNAddTwoStates(113, 120);
  +                  break;
  +               case 115:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 112;
  +                  break;
  +               case 117:
  +                  if (curChar == 58 && kind > 10)
  +                     kind = 10;
  +                  break;
  +               case 118:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 117;
  +                  break;
  +               case 119:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 114;
  +                  break;
  +               case 120:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 119;
  +                  break;
  +               case 130:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(76, 78);
  +                  break;
  +               case 131:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(132, 139);
  +                  break;
  +               case 132:
  +                  jjCheckNAddTwoStates(132, 139);
  +                  break;
  +               case 134:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 131;
  +                  break;
  +               case 136:
  +                  if (curChar == 58 && kind > 14)
  +                     kind = 14;
  +                  break;
  +               case 137:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 136;
  +                  break;
  +               case 138:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 133;
  +                  break;
  +               case 139:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 138;
  +                  break;
  +               case 143:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 142;
  +                  break;
  +               case 146:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 145;
  +                  break;
  +               case 157:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(79, 81);
  +                  break;
  +               case 158:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(159, 182);
  +                  break;
  +               case 159:
  +                  jjCheckNAddTwoStates(159, 182);
  +                  break;
  +               case 161:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 158;
  +                  break;
  +               case 164:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(82, 84);
  +                  break;
  +               case 165:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(166, 172);
  +                  break;
  +               case 166:
  +                  jjCheckNAddTwoStates(166, 172);
  +                  break;
  +               case 168:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 165;
  +                  break;
  +               case 170:
  +                  if (curChar == 61 && kind > 47)
  +                     kind = 47;
  +                  break;
  +               case 171:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 167;
  +                  break;
  +               case 172:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 171;
  +                  break;
  +               case 181:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 160;
  +                  break;
  +               case 182:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 181;
  +                  break;
  +               case 189:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(85, 87);
  +                  break;
  +               case 190:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(191, 203);
  +                  break;
  +               case 191:
  +                  jjCheckNAddTwoStates(191, 203);
  +                  break;
  +               case 193:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 190;
  +                  break;
  +               case 202:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 192;
  +                  break;
  +               case 203:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 202;
  +                  break;
  +               case 210:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(88, 90);
  +                  break;
  +               case 211:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(212, 225);
  +                  break;
  +               case 212:
  +                  jjCheckNAddTwoStates(212, 225);
  +                  break;
  +               case 214:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 211;
  +                  break;
  +               case 224:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 213;
  +                  break;
  +               case 225:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 224;
  +                  break;
  +               case 232:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(91, 93);
  +                  break;
  +               case 233:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(234, 240);
  +                  break;
  +               case 234:
  +                  jjCheckNAddTwoStates(234, 240);
  +                  break;
  +               case 236:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 233;
  +                  break;
  +               case 239:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 235;
  +                  break;
  +               case 240:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 239;
  +                  break;
  +               case 249:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(94, 96);
  +                  break;
  +               case 250:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(251, 258);
  +                  break;
  +               case 251:
  +                  jjCheckNAddTwoStates(251, 258);
  +                  break;
  +               case 253:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 250;
  +                  break;
  +               case 255:
  +                  if (curChar == 58 && kind > 11)
  +                     kind = 11;
  +                  break;
  +               case 256:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 255;
  +                  break;
  +               case 257:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 252;
  +                  break;
  +               case 258:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 257;
  +                  break;
  +               case 264:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(97, 99);
  +                  break;
  +               case 265:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(266, 273);
  +                  break;
  +               case 266:
  +                  jjCheckNAddTwoStates(266, 273);
  +                  break;
  +               case 268:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 265;
  +                  break;
  +               case 270:
  +                  if (curChar == 58 && kind > 17)
  +                     kind = 17;
  +                  break;
  +               case 271:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 270;
  +                  break;
  +               case 272:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 267;
  +                  break;
  +               case 273:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 272;
  +                  break;
  +               case 280:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 279;
  +                  break;
  +               case 290:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(100, 102);
  +                  break;
  +               case 291:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(292, 299);
  +                  break;
  +               case 292:
  +                  jjCheckNAddTwoStates(292, 299);
  +                  break;
  +               case 294:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 291;
  +                  break;
  +               case 296:
  +                  if (curChar == 58 && kind > 19)
  +                     kind = 19;
  +                  break;
  +               case 297:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 296;
  +                  break;
  +               case 298:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 293;
  +                  break;
  +               case 299:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 298;
  +                  break;
  +               case 308:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(103, 105);
  +                  break;
  +               case 309:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(310, 316);
  +                  break;
  +               case 310:
  +                  jjCheckNAddTwoStates(310, 316);
  +                  break;
  +               case 312:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 309;
  +                  break;
  +               case 314:
  +                  if (curChar == 40 && kind > 106)
  +                     kind = 106;
  +                  break;
  +               case 315:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 311;
  +                  break;
  +               case 316:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 315;
  +                  break;
  +               case 327:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 326;
  +                  break;
  +               case 339:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(106, 108);
  +                  break;
  +               case 340:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(341, 348);
  +                  break;
  +               case 341:
  +                  jjCheckNAddTwoStates(341, 348);
  +                  break;
  +               case 343:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 340;
  +                  break;
  +               case 345:
  +                  if (curChar == 58 && kind > 12)
  +                     kind = 12;
  +                  break;
  +               case 346:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 345;
  +                  break;
  +               case 347:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 342;
  +                  break;
  +               case 348:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 347;
  +                  break;
  +               case 357:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(109, 111);
  +                  break;
  +               case 358:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(359, 366);
  +                  break;
  +               case 359:
  +                  jjCheckNAddTwoStates(359, 366);
  +                  break;
  +               case 361:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 358;
  +                  break;
  +               case 363:
  +                  if (curChar == 58 && kind > 15)
  +                     kind = 15;
  +                  break;
  +               case 364:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 363;
  +                  break;
  +               case 365:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 360;
  +                  break;
  +               case 366:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 365;
  +                  break;
  +               case 374:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(112, 114);
  +                  break;
  +               case 375:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(376, 383);
  +                  break;
  +               case 376:
  +                  jjCheckNAddTwoStates(376, 383);
  +                  break;
  +               case 378:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 375;
  +                  break;
  +               case 380:
  +                  if (curChar == 58 && kind > 21)
  +                     kind = 21;
  +                  break;
  +               case 381:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 380;
  +                  break;
  +               case 382:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 377;
  +                  break;
  +               case 383:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 382;
  +                  break;
  +               case 387:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 386;
  +                  break;
  +               case 390:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 389;
  +                  break;
  +               case 399:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(115, 117);
  +                  break;
  +               case 400:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(401, 420);
  +                  break;
  +               case 401:
  +                  jjCheckNAddTwoStates(401, 420);
  +                  break;
  +               case 403:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 400;
  +                  break;
  +               case 406:
  +                  if ((0x3ff600000000000L & l) != 0L)
  +                     jjAddStates(118, 119);
  +                  break;
  +               case 407:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 408;
  +                  break;
  +               case 409:
  +                  if ((0x3ff600000000000L & l) != 0L)
  +                     jjCheckNAddStates(120, 123);
  +                  break;
  +               case 410:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjCheckNAddStates(124, 126);
  +                  break;
  +               case 411:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(412, 418);
  +                  break;
  +               case 412:
  +                  jjCheckNAddTwoStates(412, 418);
  +                  break;
  +               case 414:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 411;
  +                  break;
  +               case 417:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 413;
  +                  break;
  +               case 418:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 417;
  +                  break;
  +               case 419:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 402;
  +                  break;
  +               case 420:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 419;
  +                  break;
  +               case 429:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(127, 129);
  +                  break;
  +               case 430:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(431, 437);
  +                  break;
  +               case 431:
  +                  jjCheckNAddTwoStates(431, 437);
  +                  break;
  +               case 433:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 430;
  +                  break;
  +               case 436:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 432;
  +                  break;
  +               case 437:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 436;
  +                  break;
  +               case 447:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(130, 132);
  +                  break;
  +               case 448:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(449, 456);
  +                  break;
  +               case 449:
  +                  jjCheckNAddTwoStates(449, 456);
  +                  break;
  +               case 451:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 448;
  +                  break;
  +               case 453:
  +                  if (curChar == 58 && kind > 13)
  +                     kind = 13;
  +                  break;
  +               case 454:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 453;
  +                  break;
  +               case 455:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 450;
  +                  break;
  +               case 456:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 455;
  +                  break;
  +               case 460:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(133, 135);
  +                  break;
  +               case 461:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(462, 468);
  +                  break;
  +               case 462:
  +                  jjCheckNAddTwoStates(462, 468);
  +                  break;
  +               case 464:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 461;
  +                  break;
  +               case 466:
  +                  if (curChar == 36 && kind > 89)
  +                     kind = 89;
  +                  break;
  +               case 467:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 463;
  +                  break;
  +               case 468:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 467;
  +                  break;
  +               case 473:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(136, 138);
  +                  break;
  +               case 474:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(475, 482);
  +                  break;
  +               case 475:
  +                  jjCheckNAddTwoStates(475, 482);
  +                  break;
  +               case 477:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 474;
  +                  break;
  +               case 479:
  +                  if (curChar == 58 && kind > 16)
  +                     kind = 16;
  +                  break;
  +               case 480:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 479;
  +                  break;
  +               case 481:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 476;
  +                  break;
  +               case 482:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 481;
  +                  break;
  +               case 489:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 488;
  +                  break;
  +               case 499:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(139, 141);
  +                  break;
  +               case 500:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(501, 508);
  +                  break;
  +               case 501:
  +                  jjCheckNAddTwoStates(501, 508);
  +                  break;
  +               case 503:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 500;
  +                  break;
  +               case 505:
  +                  if (curChar == 58 && kind > 18)
  +                     kind = 18;
  +                  break;
  +               case 506:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 505;
  +                  break;
  +               case 507:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 502;
  +                  break;
  +               case 508:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 507;
  +                  break;
  +               case 517:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(142, 144);
  +                  break;
  +               case 518:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(519, 525);
  +                  break;
  +               case 519:
  +                  jjCheckNAddTwoStates(519, 525);
  +                  break;
  +               case 521:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 518;
  +                  break;
  +               case 523:
  +                  if (curChar == 36 && kind > 91)
  +                     kind = 91;
  +                  break;
  +               case 524:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 520;
  +                  break;
  +               case 525:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 524;
  +                  break;
  +               case 529:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(145, 147);
  +                  break;
  +               case 530:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(531, 538);
  +                  break;
  +               case 531:
  +                  jjCheckNAddTwoStates(531, 538);
  +                  break;
  +               case 533:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 530;
  +                  break;
  +               case 535:
  +                  if (curChar == 58 && kind > 20)
  +                     kind = 20;
  +                  break;
  +               case 536:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 535;
  +                  break;
  +               case 537:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 532;
  +                  break;
  +               case 538:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 537;
  +                  break;
  +               case 547:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(148, 150);
  +                  break;
  +               case 548:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(549, 555);
  +                  break;
  +               case 549:
  +                  jjCheckNAddTwoStates(549, 555);
  +                  break;
  +               case 551:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 548;
  +                  break;
  +               case 553:
  +                  if (curChar == 40 && kind > 103)
  +                     kind = 103;
  +                  break;
  +               case 554:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 550;
  +                  break;
  +               case 555:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 554;
  +                  break;
  +               case 560:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(151, 153);
  +                  break;
  +               case 561:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(562, 581);
  +                  break;
  +               case 562:
  +                  jjCheckNAddTwoStates(562, 581);
  +                  break;
  +               case 564:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 561;
  +                  break;
  +               case 567:
  +                  if ((0x3ff600000000000L & l) != 0L)
  +                     jjAddStates(154, 155);
  +                  break;
  +               case 568:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 569;
  +                  break;
  +               case 570:
  +                  if ((0x3ff600000000000L & l) != 0L)
  +                     jjCheckNAddStates(156, 159);
  +                  break;
  +               case 571:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjCheckNAddStates(160, 162);
  +                  break;
  +               case 572:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(573, 579);
  +                  break;
  +               case 573:
  +                  jjCheckNAddTwoStates(573, 579);
  +                  break;
  +               case 575:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 572;
  +                  break;
  +               case 578:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 574;
  +                  break;
  +               case 579:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 578;
  +                  break;
  +               case 580:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 563;
  +                  break;
  +               case 581:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 580;
  +                  break;
  +               case 588:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(163, 165);
  +                  break;
  +               case 589:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(590, 596);
  +                  break;
  +               case 590:
  +                  jjCheckNAddTwoStates(590, 596);
  +                  break;
  +               case 592:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 589;
  +                  break;
  +               case 595:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 591;
  +                  break;
  +               case 596:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 595;
  +                  break;
  +               case 603:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(166, 168);
  +                  break;
  +               case 604:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(605, 611);
  +                  break;
  +               case 605:
  +                  jjCheckNAddTwoStates(605, 611);
  +                  break;
  +               case 607:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 604;
  +                  break;
  +               case 609:
  +                  if (curChar == 36 && kind > 90)
  +                     kind = 90;
  +                  break;
  +               case 610:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 606;
  +                  break;
  +               case 611:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 610;
  +                  break;
  +               case 617:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(169, 171);
  +                  break;
  +               case 618:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(619, 629);
  +                  break;
  +               case 619:
  +                  jjCheckNAddTwoStates(619, 629);
  +                  break;
  +               case 621:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 618;
  +                  break;
  +               case 624:
  +                  if ((0x3ff600000000000L & l) != 0L)
  +                     jjAddStates(172, 173);
  +                  break;
  +               case 625:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 626;
  +                  break;
  +               case 627:
  +                  if ((0x3ff600000000000L & l) == 0L)
  +                     break;
  +                  if (kind > 52)
  +                     kind = 52;
  +                  jjstateSet[jjnewStateCnt++] = 627;
  +                  break;
  +               case 628:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 620;
  +                  break;
  +               case 629:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 628;
  +                  break;
  +               case 633:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(174, 176);
  +                  break;
  +               case 634:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(635, 642);
  +                  break;
  +               case 635:
  +                  jjCheckNAddTwoStates(635, 642);
  +                  break;
  +               case 637:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 634;
  +                  break;
  +               case 641:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 636;
  +                  break;
  +               case 642:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 641;
  +                  break;
  +               case 647:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(177, 179);
  +                  break;
  +               case 648:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(649, 655);
  +                  break;
  +               case 649:
  +                  jjCheckNAddTwoStates(649, 655);
  +                  break;
  +               case 651:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 648;
  +                  break;
  +               case 653:
  +                  if (curChar == 40 && kind > 105)
  +                     kind = 105;
  +                  break;
  +               case 654:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 650;
  +                  break;
  +               case 655:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 654;
  +                  break;
  +               case 659:
  +                  if ((0x3ff600000000000L & l) != 0L)
  +                     jjAddStates(180, 181);
  +                  break;
  +               case 660:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 661;
  +                  break;
  +               case 661:
  +                  if (curChar == 42 && kind > 58)
  +                     kind = 58;
  +                  break;
  +               case 662:
  +                  if ((0x3ff600000000000L & l) != 0L)
  +                     jjAddStates(182, 183);
  +                  break;
  +               case 663:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 664;
  +                  break;
  +               case 665:
  +                  if ((0x3ff600000000000L & l) == 0L)
  +                     break;
  +                  if (kind > 116)
  +                     kind = 116;
  +                  jjstateSet[jjnewStateCnt++] = 665;
  +                  break;
  +               case 666:
  +                  if ((0x3ff600000000000L & l) != 0L)
  +                     jjAddStates(184, 185);
  +                  break;
  +               case 667:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 668;
  +                  break;
  +               case 669:
  +                  if ((0x3ff600000000000L & l) != 0L)
  +                     jjCheckNAddStates(186, 189);
  +                  break;
  +               case 670:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjCheckNAddStates(190, 192);
  +                  break;
  +               case 671:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(672, 678);
  +                  break;
  +               case 672:
  +                  jjCheckNAddTwoStates(672, 678);
  +                  break;
  +               case 674:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 671;
  +                  break;
  +               case 676:
  +                  if (curChar == 40 && kind > 117)
  +                     kind = 117;
  +                  break;
  +               case 677:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 673;
  +                  break;
  +               case 678:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 677;
  +                  break;
  +               case 681:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(193, 195);
  +                  break;
  +               case 682:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(683, 689);
  +                  break;
  +               case 683:
  +                  jjCheckNAddTwoStates(683, 689);
  +                  break;
  +               case 685:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 682;
  +                  break;
  +               case 688:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 684;
  +                  break;
  +               case 689:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 688;
  +                  break;
  +               case 697:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(196, 198);
  +                  break;
  +               case 698:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(699, 711);
  +                  break;
  +               case 699:
  +                  jjCheckNAddTwoStates(699, 711);
  +                  break;
  +               case 701:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 698;
  +                  break;
  +               case 710:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 700;
  +                  break;
  +               case 711:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 710;
  +                  break;
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      else if (curChar < 128)
  +      {
  +         long l = 1L << (curChar & 077);
            MatchLoop: do
            {
               switch(jjstateSet[--i])
               {
  -               case 9:
  -                  if ((0x3ff600000000000L & l) != 0L)
  +               case 19:
  +                  if ((0x7fffffe87fffffeL & l) != 0L)
                     {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(26);
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAddStates(199, 209);
                     }
  -                  else if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 25;
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(23, 24);
  -                  else if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 22;
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(20, 21);
  +                  else if (curChar == 123)
  +                     jjCheckNAddTwoStates(55, 60);
  +                  if (curChar == 118)
  +                     jjAddStates(210, 211);
  +                  else if (curChar == 116)
  +                     jjAddStates(212, 214);
  +                  else if (curChar == 101)
  +                     jjAddStates(215, 217);
  +                  else if (curChar == 110)
  +                     jjAddStates(218, 219);
  +                  else if (curChar == 102)
  +                     jjAddStates(220, 222);
  +                  else if (curChar == 115)
  +                     jjAddStates(223, 224);
  +                  else if (curChar == 97)
  +                     jjAddStates(225, 229);
  +                  else if (curChar == 112)
  +                     jjAddStates(230, 233);
  +                  else if (curChar == 100)
  +                     jjAddStates(234, 239);
  +                  else if (curChar == 99)
  +                     jjAddStates(240, 242);
  +                  else if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 24;
  +                  else if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 6;
  +                  break;
  +               case 1:
  +                  jjAddStates(243, 244);
  +                  break;
  +               case 4:
  +                  jjAddStates(245, 246);
  +                  break;
  +               case 6:
  +                  if (curChar == 102)
  +                     jjCheckNAddTwoStates(7, 12);
  +                  break;
  +               case 9:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(247, 248);
  +                  break;
  +               case 10:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(55, 57);
  +                  break;
  +               case 12:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 11;
  +                  break;
  +               case 13:
  +                  if (curChar == 101 && kind > 50)
  +                     kind = 50;
  +                  break;
  +               case 14:
  +                  if (curChar == 112)
  +                     jjstateSet[jjnewStateCnt++] = 13;
  +                  break;
  +               case 15:
  +                  if (curChar == 121)
  +                     jjstateSet[jjnewStateCnt++] = 14;
  +                  break;
  +               case 16:
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 15;
  +                  break;
  +               case 22:
  +               case 23:
  +                  if ((0x7fffffe87fffffeL & l) == 0L)
  +                     break;
  +                  if (kind > 59)
  +                     kind = 59;
  +                  jjCheckNAdd(23);
  +                  break;
  +               case 24:
  +                  if (curChar == 102)
  +                     jjCheckNAddStates(58, 60);
  +                  break;
  +               case 27:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(249, 250);
  +                  break;
  +               case 28:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(58, 60);
  +                  break;
  +               case 30:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 29;
  +                  break;
  +               case 34:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 24;
  +                  break;
  +               case 43:
  +                  if ((0x2000000020L & l) != 0L)
  +                     jjAddStates(251, 252);
  +                  break;
  +               case 49:
  +                  if (curChar == 123)
  +                     jjCheckNAddTwoStates(55, 60);
  +                  break;
  +               case 51:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(253, 254);
  +                  break;
  +               case 52:
  +                  if (curChar == 125 && kind > 5)
  +                     kind = 5;
  +                  break;
  +               case 57:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(255, 256);
  +                  break;
  +               case 58:
  +                  if (curChar != 125)
  +                     break;
  +                  if (kind > 6)
  +                     kind = 6;
  +                  jjAddStates(257, 258);
  +                  break;
  +               case 61:
  +                  if (curChar == 123)
  +                     jjCheckNAdd(60);
  +                  break;
  +               case 66:
  +                  if (curChar == 99)
  +                     jjAddStates(240, 242);
  +                  break;
  +               case 67:
  +                  if (curChar == 100)
  +                     jjCheckNAddStates(64, 66);
  +                  break;
  +               case 70:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(259, 260);
  +                  break;
  +               case 71:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(64, 66);
  +                  break;
  +               case 73:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 72;
  +                  break;
  +               case 78:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 67;
  +                  break;
  +               case 79:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 78;
  +                  break;
  +               case 80:
  +                  if (curChar == 104)
  +                     jjstateSet[jjnewStateCnt++] = 79;
  +                  break;
  +               case 81:
  +                  if (curChar == 116)
  +                     jjCheckNAddTwoStates(82, 87);
  +                  break;
  +               case 84:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(261, 262);
  +                  break;
  +               case 85:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(67, 69);
  +                  break;
  +               case 87:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 86;
  +                  break;
  +               case 88:
  +                  if (curChar == 115 && kind > 92)
  +                     kind = 92;
  +                  break;
  +               case 89:
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 88;
  +                  break;
  +               case 92:
  +                  if (curChar == 115)
  +                     jjstateSet[jjnewStateCnt++] = 81;
  +                  break;
  +               case 93:
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 92;
  +                  break;
  +               case 94:
  +                  if (curChar == 116)
  +                     jjCheckNAddStates(70, 72);
  +                  break;
  +               case 97:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(263, 264);
  +                  break;
  +               case 98:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(70, 72);
  +                  break;
  +               case 100:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 99;
  +                  break;
  +               case 104:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 94;
  +                  break;
  +               case 105:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 104;
  +                  break;
  +               case 106:
  +                  if (curChar == 109)
  +                     jjstateSet[jjnewStateCnt++] = 105;
  +                  break;
  +               case 107:
  +                  if (curChar == 109)
  +                     jjstateSet[jjnewStateCnt++] = 106;
  +                  break;
  +               case 108:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 107;
  +                  break;
  +               case 109:
  +                  if (curChar == 100)
  +                     jjAddStates(234, 239);
  +                  break;
  +               case 110:
  +                  if (curChar == 116)
  +                     jjCheckNAddStates(73, 75);
  +                  break;
  +               case 113:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(265, 266);
  +                  break;
  +               case 114:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(73, 75);
  +                  break;
  +               case 116:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 115;
  +                  break;
  +               case 121:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 110;
  +                  break;
  +               case 122:
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 121;
  +                  break;
  +               case 123:
  +                  if (curChar == 100)
  +                     jjstateSet[jjnewStateCnt++] = 122;
  +                  break;
  +               case 124:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 123;
  +                  break;
  +               case 125:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 124;
  +                  break;
  +               case 126:
  +                  if (curChar == 99)
  +                     jjstateSet[jjnewStateCnt++] = 125;
  +                  break;
  +               case 127:
  +                  if (curChar == 115)
  +                     jjstateSet[jjnewStateCnt++] = 126;
  +                  break;
  +               case 128:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 127;
  +                  break;
  +               case 129:
  +                  if (curChar == 102)
  +                     jjCheckNAddStates(76, 78);
  +                  break;
  +               case 132:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(267, 268);
  +                  break;
  +               case 133:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(76, 78);
  +                  break;
  +               case 135:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 134;
  +                  break;
  +               case 140:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 129;
  +                  break;
  +               case 141:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 140;
  +                  break;
  +               case 142:
  +                  if (curChar == 115)
  +                     jjstateSet[jjnewStateCnt++] = 141;
  +                  break;
  +               case 144:
  +                  if (curChar == 114)
  +                     jjstateSet[jjnewStateCnt++] = 143;
  +                  break;
  +               case 145:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 144;
  +                  break;
  +               case 147:
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 146;
  +                  break;
  +               case 148:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 147;
  +                  break;
  +               case 149:
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 148;
  +                  break;
  +               case 150:
  +                  if (curChar == 100)
  +                     jjstateSet[jjnewStateCnt++] = 149;
  +                  break;
  +               case 151:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 150;
  +                  break;
  +               case 152:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 151;
  +                  break;
  +               case 153:
  +                  if (curChar == 99)
  +                     jjstateSet[jjnewStateCnt++] = 152;
  +                  break;
  +               case 154:
  +                  if (curChar == 115)
  +                     jjstateSet[jjnewStateCnt++] = 153;
  +                  break;
  +               case 155:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 154;
  +                  break;
  +               case 156:
  +                  if (curChar == 116)
  +                     jjCheckNAddTwoStates(157, 162);
  +                  break;
  +               case 159:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(269, 270);
  +                  break;
  +               case 160:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(79, 81);
  +                  break;
  +               case 162:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 161;
  +                  break;
  +               case 163:
  +                  if (curChar == 110)
  +                     jjCheckNAddTwoStates(164, 169);
  +                  break;
  +               case 166:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(271, 272);
  +                  break;
  +               case 167:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(82, 84);
  +                  break;
  +               case 169:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 168;
  +                  break;
  +               case 173:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 163;
  +                  break;
  +               case 174:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 173;
  +                  break;
  +               case 175:
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 174;
  +                  break;
  +               case 176:
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 175;
  +                  break;
  +               case 177:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 176;
  +                  break;
  +               case 178:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 177;
  +                  break;
  +               case 179:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 178;
  +                  break;
  +               case 180:
  +                  if (curChar == 99)
  +                     jjstateSet[jjnewStateCnt++] = 179;
  +                  break;
  +               case 183:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 156;
  +                  break;
  +               case 184:
  +                  if (curChar == 117)
  +                     jjstateSet[jjnewStateCnt++] = 183;
  +                  break;
  +               case 185:
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 184;
  +                  break;
  +               case 186:
  +                  if (curChar == 102)
  +                     jjstateSet[jjnewStateCnt++] = 185;
  +                  break;
  +               case 187:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 186;
  +                  break;
  +               case 188:
  +                  if (curChar == 116)
  +                     jjCheckNAddTwoStates(189, 194);
  +                  break;
  +               case 191:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(273, 274);
  +                  break;
  +               case 192:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(85, 87);
  +                  break;
  +               case 194:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 193;
  +                  break;
  +               case 195:
  +                  if (curChar == 116 && kind > 48)
  +                     kind = 48;
  +                  break;
  +               case 196:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 195;
  +                  break;
  +               case 197:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 196;
  +                  break;
  +               case 198:
  +                  if (curChar == 109)
  +                     jjstateSet[jjnewStateCnt++] = 197;
  +                  break;
  +               case 199:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 198;
  +                  break;
  +               case 200:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 199;
  +                  break;
  +               case 201:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 200;
  +                  break;
  +               case 204:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 188;
  +                  break;
  +               case 205:
  +                  if (curChar == 117)
  +                     jjstateSet[jjnewStateCnt++] = 204;
  +                  break;
  +               case 206:
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 205;
  +                  break;
  +               case 207:
  +                  if (curChar == 102)
  +                     jjstateSet[jjnewStateCnt++] = 206;
  +                  break;
  +               case 208:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 207;
  +                  break;
  +               case 209:
  +                  if (curChar == 116)
  +                     jjCheckNAddTwoStates(210, 215);
  +                  break;
  +               case 212:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(275, 276);
  +                  break;
  +               case 213:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(88, 90);
  +                  break;
  +               case 215:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 214;
  +                  break;
  +               case 216:
  +                  if (curChar == 110 && kind > 49)
  +                     kind = 49;
  +                  break;
  +               case 217:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 216;
  +                  break;
  +               case 218:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 217;
  +                  break;
  +               case 219:
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 218;
  +                  break;
  +               case 220:
  +                  if (curChar == 99)
  +                     jjstateSet[jjnewStateCnt++] = 219;
  +                  break;
  +               case 221:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 220;
  +                  break;
  +               case 222:
  +                  if (curChar == 117)
  +                     jjstateSet[jjnewStateCnt++] = 221;
  +                  break;
  +               case 223:
  +                  if (curChar == 102)
  +                     jjstateSet[jjnewStateCnt++] = 222;
  +                  break;
  +               case 226:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 209;
  +                  break;
  +               case 227:
  +                  if (curChar == 117)
  +                     jjstateSet[jjnewStateCnt++] = 226;
  +                  break;
  +               case 228:
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 227;
  +                  break;
  +               case 229:
  +                  if (curChar == 102)
  +                     jjstateSet[jjnewStateCnt++] = 228;
  +                  break;
  +               case 230:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 229;
  +                  break;
  +               case 231:
  +                  if (curChar == 116)
  +                     jjCheckNAddStates(91, 93);
  +                  break;
  +               case 234:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(277, 278);
  +                  break;
  +               case 235:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(91, 93);
  +                  break;
  +               case 237:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 236;
  +                  break;
  +               case 238:
  +                  if (curChar == 123 && kind > 99)
  +                     kind = 99;
  +                  break;
  +               case 241:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 231;
  +                  break;
  +               case 242:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 241;
  +                  break;
  +               case 243:
  +                  if (curChar == 109)
  +                     jjstateSet[jjnewStateCnt++] = 242;
  +                  break;
  +               case 244:
  +                  if (curChar == 117)
  +                     jjstateSet[jjnewStateCnt++] = 243;
  +                  break;
  +               case 245:
  +                  if (curChar == 99)
  +                     jjstateSet[jjnewStateCnt++] = 244;
  +                  break;
  +               case 246:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 245;
  +                  break;
  +               case 247:
  +                  if (curChar == 112)
  +                     jjAddStates(230, 233);
  +                  break;
  +               case 248:
  +                  if (curChar == 116)
  +                     jjCheckNAddStates(94, 96);
  +                  break;
  +               case 251:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(279, 280);
  +                  break;
  +               case 252:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(94, 96);
  +                  break;
  +               case 254:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 253;
  +                  break;
  +               case 259:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 248;
  +                  break;
  +               case 260:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 259;
  +                  break;
  +               case 261:
  +                  if (curChar == 114)
  +                     jjstateSet[jjnewStateCnt++] = 260;
  +                  break;
  +               case 262:
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 261;
  +                  break;
  +               case 263:
  +                  if (curChar == 103)
  +                     jjCheckNAddStates(97, 99);
  +                  break;
  +               case 266:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(281, 282);
  +                  break;
  +               case 267:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(97, 99);
  +                  break;
  +               case 269:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 268;
  +                  break;
  +               case 274:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 263;
  +                  break;
  +               case 275:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 274;
  +                  break;
  +               case 276:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 275;
  +                  break;
  +               case 277:
  +                  if (curChar == 98)
  +                     jjstateSet[jjnewStateCnt++] = 276;
  +                  break;
  +               case 278:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 277;
  +                  break;
  +               case 279:
  +                  if (curChar == 115)
  +                     jjstateSet[jjnewStateCnt++] = 278;
  +                  break;
  +               case 281:
  +                  if (curChar == 103)
  +                     jjstateSet[jjnewStateCnt++] = 280;
  +                  break;
  +               case 282:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 281;
  +                  break;
  +               case 283:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 282;
  +                  break;
  +               case 284:
  +                  if (curChar == 100)
  +                     jjstateSet[jjnewStateCnt++] = 283;
  +                  break;
  +               case 285:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 284;
  +                  break;
  +               case 286:
  +                  if (curChar == 99)
  +                     jjstateSet[jjnewStateCnt++] = 285;
  +                  break;
  +               case 287:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 286;
  +                  break;
  +               case 288:
  +                  if (curChar == 114)
  +                     jjstateSet[jjnewStateCnt++] = 287;
  +                  break;
  +               case 289:
  +                  if (curChar == 103)
  +                     jjCheckNAddStates(100, 102);
  +                  break;
  +               case 292:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(283, 284);
  +                  break;
  +               case 293:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(100, 102);
  +                  break;
  +               case 295:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 294;
  +                  break;
  +               case 300:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 289;
  +                  break;
  +               case 301:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 300;
  +                  break;
  +               case 302:
  +                  if (curChar == 100)
  +                     jjstateSet[jjnewStateCnt++] = 301;
  +                  break;
  +               case 303:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 302;
  +                  break;
  +               case 304:
  +                  if (curChar == 99)
  +                     jjstateSet[jjnewStateCnt++] = 303;
  +                  break;
  +               case 305:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 304;
  +                  break;
  +               case 306:
  +                  if (curChar == 114)
  +                     jjstateSet[jjnewStateCnt++] = 305;
  +                  break;
  +               case 307:
  +                  if (curChar == 110)
  +                     jjCheckNAddStates(103, 105);
  +                  break;
  +               case 310:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(285, 286);
  +                  break;
  +               case 311:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(103, 105);
  +                  break;
  +               case 313:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 312;
  +                  break;
  +               case 317:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 307;
  +                  break;
  +               case 318:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 317;
  +                  break;
  +               case 319:
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 318;
  +                  break;
  +               case 320:
  +                  if (curChar == 99)
  +                     jjstateSet[jjnewStateCnt++] = 319;
  +                  break;
  +               case 321:
  +                  if (curChar == 117)
  +                     jjstateSet[jjnewStateCnt++] = 320;
  +                  break;
  +               case 322:
  +                  if (curChar == 114)
  +                     jjstateSet[jjnewStateCnt++] = 321;
  +                  break;
  +               case 323:
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 322;
  +                  break;
  +               case 324:
  +                  if (curChar == 115)
  +                     jjstateSet[jjnewStateCnt++] = 323;
  +                  break;
  +               case 325:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 324;
  +                  break;
  +               case 326:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 325;
  +                  break;
  +               case 328:
  +                  if (curChar == 103)
  +                     jjstateSet[jjnewStateCnt++] = 327;
  +                  break;
  +               case 329:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 328;
  +                  break;
  +               case 330:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 329;
  +                  break;
  +               case 331:
  +                  if (curChar == 115)
  +                     jjstateSet[jjnewStateCnt++] = 330;
  +                  break;
  +               case 332:
  +                  if (curChar == 115)
  +                     jjstateSet[jjnewStateCnt++] = 331;
  +                  break;
  +               case 333:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 332;
  +                  break;
  +               case 334:
  +                  if (curChar == 99)
  +                     jjstateSet[jjnewStateCnt++] = 333;
  +                  break;
  +               case 335:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 334;
  +                  break;
  +               case 336:
  +                  if (curChar == 114)
  +                     jjstateSet[jjnewStateCnt++] = 335;
  +                  break;
  +               case 337:
  +                  if (curChar == 97)
  +                     jjAddStates(225, 229);
  +                  break;
  +               case 338:
  +                  if (curChar == 101)
  +                     jjCheckNAddStates(106, 108);
  +                  break;
  +               case 341:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(287, 288);
  +                  break;
  +               case 342:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(106, 108);
  +                  break;
  +               case 344:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 343;
  +                  break;
  +               case 349:
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 338;
  +                  break;
  +               case 350:
  +                  if (curChar == 117)
  +                     jjstateSet[jjnewStateCnt++] = 349;
  +                  break;
  +               case 351:
  +                  if (curChar == 98)
  +                     jjstateSet[jjnewStateCnt++] = 350;
  +                  break;
  +               case 352:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 351;
  +                  break;
  +               case 353:
  +                  if (curChar == 114)
  +                     jjstateSet[jjnewStateCnt++] = 352;
  +                  break;
  +               case 354:
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 353;
  +                  break;
  +               case 355:
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 354;
  +                  break;
  +               case 356:
  +                  if (curChar == 114)
  +                     jjCheckNAddStates(109, 111);
  +                  break;
  +               case 359:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(289, 290);
  +                  break;
  +               case 360:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(109, 111);
  +                  break;
  +               case 362:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 361;
  +                  break;
  +               case 367:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 356;
  +                  break;
  +               case 368:
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 367;
  +                  break;
  +               case 369:
  +                  if (curChar == 115)
  +                     jjstateSet[jjnewStateCnt++] = 368;
  +                  break;
  +               case 370:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 369;
  +                  break;
  +               case 371:
  +                  if (curChar == 99)
  +                     jjstateSet[jjnewStateCnt++] = 370;
  +                  break;
  +               case 372:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 371;
  +                  break;
  +               case 373:
  +                  if (curChar == 102)
  +                     jjCheckNAddStates(112, 114);
  +                  break;
  +               case 376:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(291, 292);
  +                  break;
  +               case 377:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(112, 114);
  +                  break;
  +               case 379:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 378;
  +                  break;
  +               case 384:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 373;
  +                  break;
  +               case 385:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 384;
  +                  break;
  +               case 386:
  +                  if (curChar == 115)
  +                     jjstateSet[jjnewStateCnt++] = 385;
  +                  break;
  +               case 388:
  +                  if (curChar == 114)
  +                     jjstateSet[jjnewStateCnt++] = 387;
  +                  break;
  +               case 389:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 388;
  +                  break;
  +               case 391:
  +                  if (curChar == 114)
  +                     jjstateSet[jjnewStateCnt++] = 390;
  +                  break;
  +               case 392:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 391;
  +                  break;
  +               case 393:
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 392;
  +                  break;
  +               case 394:
  +                  if (curChar == 115)
  +                     jjstateSet[jjnewStateCnt++] = 393;
  +                  break;
  +               case 395:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 394;
  +                  break;
  +               case 396:
  +                  if (curChar == 99)
  +                     jjstateSet[jjnewStateCnt++] = 395;
  +                  break;
  +               case 397:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 396;
  +                  break;
  +               case 398:
  +                  if (curChar == 101)
  +                     jjCheckNAddTwoStates(399, 404);
  +                  break;
  +               case 401:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(293, 294);
  +                  break;
  +               case 402:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(115, 117);
  +                  break;
  +               case 404:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 403;
  +                  break;
  +               case 405:
  +                  if ((0x7fffffe87fffffeL & l) != 0L)
  +                     jjCheckNAddStates(295, 300);
  +                  break;
  +               case 406:
  +                  if ((0x7fffffe87fffffeL & l) != 0L)
  +                     jjCheckNAddTwoStates(406, 407);
  +                  break;
  +               case 408:
  +               case 409:
  +                  if ((0x7fffffe87fffffeL & l) != 0L)
  +                     jjCheckNAddStates(120, 123);
  +                  break;
  +               case 412:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(301, 302);
  +                  break;
  +               case 413:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(124, 126);
  +                  break;
  +               case 415:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 414;
  +                  break;
  +               case 416:
  +                  if (curChar == 123 && kind > 44)
  +                     kind = 44;
  +                  break;
  +               case 421:
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 398;
  +                  break;
  +               case 422:
  +                  if (curChar == 117)
  +                     jjstateSet[jjnewStateCnt++] = 421;
  +                  break;
  +               case 423:
  +                  if (curChar == 98)
  +                     jjstateSet[jjnewStateCnt++] = 422;
  +                  break;
  +               case 424:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 423;
  +                  break;
  +               case 425:
  +                  if (curChar == 114)
  +                     jjstateSet[jjnewStateCnt++] = 424;
  +                  break;
  +               case 426:
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 425;
  +                  break;
  +               case 427:
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 426;
  +                  break;
  +               case 428:
  +                  if (curChar == 101)
  +                     jjCheckNAddStates(127, 129);
  +                  break;
  +               case 431:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(303, 304);
  +                  break;
  +               case 432:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(127, 129);
  +                  break;
  +               case 434:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 433;
  +                  break;
  +               case 435:
  +                  if (curChar == 123 && kind > 46)
  +                     kind = 46;
  +                  break;
  +               case 438:
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 428;
  +                  break;
  +               case 439:
  +                  if (curChar == 117)
  +                     jjstateSet[jjnewStateCnt++] = 438;
  +                  break;
  +               case 440:
  +                  if (curChar == 98)
  +                     jjstateSet[jjnewStateCnt++] = 439;
  +                  break;
  +               case 441:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 440;
  +                  break;
  +               case 442:
  +                  if (curChar == 114)
  +                     jjstateSet[jjnewStateCnt++] = 441;
  +                  break;
  +               case 443:
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 442;
  +                  break;
  +               case 444:
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 443;
  +                  break;
  +               case 445:
  +                  if (curChar == 115)
  +                     jjAddStates(223, 224);
  +                  break;
  +               case 446:
  +                  if (curChar == 102)
  +                     jjCheckNAddStates(130, 132);
  +                  break;
  +               case 449:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(305, 306);
  +                  break;
  +               case 450:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(130, 132);
  +                  break;
  +               case 452:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 451;
  +                  break;
  +               case 457:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 446;
  +                  break;
  +               case 458:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 457;
  +                  break;
  +               case 459:
  +                  if (curChar == 101)
  +                     jjCheckNAddStates(133, 135);
  +                  break;
  +               case 462:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(307, 308);
  +                  break;
  +               case 463:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(133, 135);
  +                  break;
  +               case 465:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 464;
  +                  break;
  +               case 469:
  +                  if (curChar == 109)
  +                     jjstateSet[jjnewStateCnt++] = 459;
  +                  break;
  +               case 470:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 469;
  +                  break;
  +               case 471:
  +                  if (curChar == 102)
  +                     jjAddStates(220, 222);
  +                  break;
  +               case 472:
  +                  if (curChar == 103)
  +                     jjCheckNAddStates(136, 138);
  +                  break;
  +               case 475:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(309, 310);
  +                  break;
  +               case 476:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(136, 138);
  +                  break;
  +               case 478:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 477;
  +                  break;
  +               case 483:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 472;
  +                  break;
  +               case 484:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 483;
  +                  break;
  +               case 485:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 484;
  +                  break;
  +               case 486:
  +                  if (curChar == 98)
  +                     jjstateSet[jjnewStateCnt++] = 485;
  +                  break;
  +               case 487:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 486;
  +                  break;
  +               case 488:
  +                  if (curChar == 115)
  +                     jjstateSet[jjnewStateCnt++] = 487;
  +                  break;
  +               case 490:
  +                  if (curChar == 103)
  +                     jjstateSet[jjnewStateCnt++] = 489;
  +                  break;
  +               case 491:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 490;
  +                  break;
  +               case 492:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 491;
  +                  break;
  +               case 493:
  +                  if (curChar == 119)
  +                     jjstateSet[jjnewStateCnt++] = 492;
  +                  break;
  +               case 494:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 493;
  +                  break;
  +               case 495:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 494;
  +                  break;
  +               case 496:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 495;
  +                  break;
  +               case 497:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 496;
  +                  break;
  +               case 498:
  +                  if (curChar == 103)
  +                     jjCheckNAddStates(139, 141);
  +                  break;
  +               case 501:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(311, 312);
  +                  break;
  +               case 502:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(139, 141);
  +                  break;
  +               case 504:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 503;
  +                  break;
  +               case 509:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 498;
  +                  break;
  +               case 510:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 509;
  +                  break;
  +               case 511:
  +                  if (curChar == 119)
  +                     jjstateSet[jjnewStateCnt++] = 510;
  +                  break;
  +               case 512:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 511;
  +                  break;
  +               case 513:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 512;
  +                  break;
  +               case 514:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 513;
  +                  break;
  +               case 515:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 514;
  +                  break;
  +               case 516:
  +                  if (curChar == 114)
  +                     jjCheckNAddStates(142, 144);
  +                  break;
  +               case 519:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(313, 314);
  +                  break;
  +               case 520:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(142, 144);
  +                  break;
  +               case 522:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 521;
  +                  break;
  +               case 526:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 516;
  +                  break;
  +               case 527:
  +                  if (curChar == 110)
  +                     jjAddStates(218, 219);
  +                  break;
  +               case 528:
  +                  if (curChar == 101)
  +                     jjCheckNAddStates(145, 147);
  +                  break;
  +               case 531:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(315, 316);
  +                  break;
  +               case 532:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(145, 147);
  +                  break;
  +               case 534:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 533;
  +                  break;
  +               case 539:
  +                  if (curChar == 99)
  +                     jjstateSet[jjnewStateCnt++] = 528;
  +                  break;
  +               case 540:
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 539;
  +                  break;
  +               case 541:
  +                  if (curChar == 112)
  +                     jjstateSet[jjnewStateCnt++] = 540;
  +                  break;
  +               case 542:
  +                  if (curChar == 115)
  +                     jjstateSet[jjnewStateCnt++] = 541;
  +                  break;
  +               case 543:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 542;
  +                  break;
  +               case 544:
  +                  if (curChar == 109)
  +                     jjstateSet[jjnewStateCnt++] = 543;
  +                  break;
  +               case 545:
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 544;
  +                  break;
  +               case 546:
  +                  if (curChar == 101)
  +                     jjCheckNAddStates(148, 150);
  +                  break;
  +               case 549:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(317, 318);
  +                  break;
  +               case 550:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(148, 150);
  +                  break;
  +               case 552:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 551;
  +                  break;
  +               case 556:
  +                  if (curChar == 100)
  +                     jjstateSet[jjnewStateCnt++] = 546;
  +                  break;
  +               case 557:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 556;
  +                  break;
  +               case 558:
  +                  if (curChar == 101)
  +                     jjAddStates(215, 217);
  +                  break;
  +               case 559:
  +                  if (curChar == 116)
  +                     jjCheckNAddTwoStates(560, 565);
  +                  break;
  +               case 562:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(319, 320);
  +                  break;
  +               case 563:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(151, 153);
  +                  break;
  +               case 565:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 564;
  +                  break;
  +               case 566:
  +                  if ((0x7fffffe87fffffeL & l) != 0L)
  +                     jjCheckNAddStates(321, 326);
  +                  break;
  +               case 567:
  +                  if ((0x7fffffe87fffffeL & l) != 0L)
  +                     jjCheckNAddTwoStates(567, 568);
  +                  break;
  +               case 569:
  +               case 570:
  +                  if ((0x7fffffe87fffffeL & l) != 0L)
  +                     jjCheckNAddStates(156, 159);
  +                  break;
  +               case 573:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(327, 328);
  +                  break;
  +               case 574:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(160, 162);
  +                  break;
  +               case 576:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 575;
  +                  break;
  +               case 577:
  +                  if (curChar == 123 && kind > 43)
  +                     kind = 43;
  +                  break;
  +               case 582:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 559;
  +                  break;
  +               case 583:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 582;
  +                  break;
  +               case 584:
  +                  if (curChar == 109)
  +                     jjstateSet[jjnewStateCnt++] = 583;
  +                  break;
  +               case 585:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 584;
  +                  break;
  +               case 586:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 585;
  +                  break;
  +               case 587:
  +                  if (curChar == 116)
  +                     jjCheckNAddStates(163, 165);
  +                  break;
  +               case 590:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(329, 330);
  +                  break;
  +               case 591:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(163, 165);
  +                  break;
  +               case 593:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 592;
  +                  break;
  +               case 594:
  +                  if (curChar == 123 && kind > 45)
  +                     kind = 45;
  +                  break;
  +               case 597:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 587;
                     break;
  -               case 11:
  -                  if ((0x100002600L & l) != 0L)
  -                  {
  -                     if (kind > 2)
  -                        kind = 2;
  -                     jjCheckNAddTwoStates(17, 18);
  -                  }
  -                  else if (curChar == 42)
  -                     jjstateSet[jjnewStateCnt++] = 13;
  +               case 598:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 597;
                     break;
  -               case 27:
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                  {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(26);
  -                  }
  -                  else if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 25;
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(23, 24);
  -                  else if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 22;
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(20, 21);
  +               case 599:
  +                  if (curChar == 109)
  +                     jjstateSet[jjnewStateCnt++] = 598;
                     break;
  -               case 10:
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                  {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(26);
  -                  }
  -                  else if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 25;
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(23, 24);
  -                  else if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 22;
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(20, 21);
  +               case 600:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 599;
                     break;
  -               case 1:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(58, 59);
  +               case 601:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 600;
                     break;
  -               case 12:
  -                  if (curChar == 42)
  -                     jjstateSet[jjnewStateCnt++] = 13;
  +               case 602:
  +                  if (curChar == 121)
  +                     jjCheckNAddStates(166, 168);
                     break;
  -               case 13:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 14;
  +               case 605:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(331, 332);
                     break;
  -               case 15:
  -                  if ((0x3ff600000000000L & l) == 0L)
  -                     break;
  -                  if (kind > 54)
  -                     kind = 54;
  -                  jjstateSet[jjnewStateCnt++] = 15;
  +               case 606:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(166, 168);
                     break;
  -               case 16:
  -                  if ((0x100002600L & l) == 0L)
  -                     break;
  -                  if (kind > 2)
  -                     kind = 2;
  -                  jjCheckNAddTwoStates(17, 18);
  +               case 608:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 607;
                     break;
  -               case 17:
  -                  if ((0x100002600L & l) == 0L)
  -                     break;
  -                  if (kind > 2)
  -                     kind = 2;
  -                  jjCheckNAdd(17);
  +               case 612:
  +                  if (curChar == 114)
  +                     jjstateSet[jjnewStateCnt++] = 602;
                     break;
  -               case 18:
  -                  if ((0x100002600L & l) == 0L)
  -                     break;
  -                  if (kind > 4)
  -                     kind = 4;
  -                  jjCheckNAdd(18);
  +               case 613:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 612;
                     break;
  -               case 20:
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(20, 21);
  +               case 614:
  +                  if (curChar == 118)
  +                     jjstateSet[jjnewStateCnt++] = 613;
                     break;
  -               case 21:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 22;
  +               case 615:
  +                  if (curChar == 116)
  +                     jjAddStates(212, 214);
                     break;
  -               case 22:
  -                  if (curChar == 42 && kind > 53)
  -                     kind = 53;
  +               case 616:
  +                  if (curChar == 101)
  +                     jjCheckNAddTwoStates(617, 622);
                     break;
  -               case 23:
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(23, 24);
  +               case 619:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(333, 334);
                     break;
  -               case 24:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 25;
  +               case 620:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(169, 171);
                     break;
  -               case 26:
  -                  if ((0x3ff600000000000L & l) == 0L)
  +               case 622:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 621;
  +                  break;
  +               case 623:
  +                  if ((0x7fffffe87fffffeL & l) == 0L)
                        break;
  -                  if (kind > 115)
  -                     kind = 115;
  -                  jjCheckNAdd(26);
  +                  if (kind > 52)
  +                     kind = 52;
  +                  jjCheckNAddStates(335, 337);
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      else if (curChar < 128)
  -      {
  -         long l = 1L << (curChar & 077);
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 9:
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                  {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(26);
  -                  }
  +               case 624:
                     if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(23, 24);
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(20, 21);
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 8;
  +                     jjCheckNAddTwoStates(624, 625);
                     break;
  -               case 11:
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                  {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAddStates(60, 64);
  -                  }
  -                  if (curChar == 97)
  -                     jjstateSet[jjnewStateCnt++] = 10;
  +               case 626:
  +               case 627:
  +                  if ((0x7fffffe87fffffeL & l) == 0L)
  +                     break;
  +                  if (kind > 52)
  +                     kind = 52;
  +                  jjCheckNAdd(627);
                     break;
  -               case 27:
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                  {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(26);
  -                  }
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(23, 24);
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(20, 21);
  +               case 630:
  +                  if (curChar == 112)
  +                     jjstateSet[jjnewStateCnt++] = 616;
                     break;
  -               case 10:
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                  {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(26);
  -                  }
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(23, 24);
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(20, 21);
  +               case 631:
  +                  if (curChar == 121)
  +                     jjstateSet[jjnewStateCnt++] = 630;
  +                  break;
  +               case 632:
                     if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 9;
  +                     jjCheckNAddTwoStates(633, 638);
                     break;
  -               case 0:
  -                  if (curChar == 99)
  -                     jjstateSet[jjnewStateCnt++] = 1;
  +               case 635:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(338, 339);
                     break;
  -               case 2:
  -                  if (curChar == 101 && kind > 46)
  -                     kind = 46;
  +               case 636:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(174, 176);
                     break;
  -               case 3:
  -                  if (curChar == 117)
  -                     jjstateSet[jjnewStateCnt++] = 2;
  +               case 638:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 637;
                     break;
  -               case 4:
  -                  if (curChar == 108)
  -                     jjstateSet[jjnewStateCnt++] = 3;
  +               case 639:
  +                  if (curChar == 115 && kind > 93)
  +                     kind = 93;
                     break;
  -               case 5:
  +               case 640:
                     if (curChar == 97)
  -                     jjstateSet[jjnewStateCnt++] = 4;
  +                     jjstateSet[jjnewStateCnt++] = 639;
                     break;
  -               case 6:
  -                  if (curChar == 118)
  -                     jjstateSet[jjnewStateCnt++] = 5;
  +               case 643:
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 632;
                     break;
  -               case 7:
  -                  if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 0;
  +               case 644:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 643;
                     break;
  -               case 8:
  -                  if (curChar == 109)
  -                     jjstateSet[jjnewStateCnt++] = 7;
  +               case 645:
  +                  if (curChar == 114)
  +                     jjstateSet[jjnewStateCnt++] = 644;
                     break;
  -               case 14:
  -               case 15:
  -                  if ((0x7fffffe87fffffeL & l) == 0L)
  -                     break;
  -                  if (kind > 54)
  -                     kind = 54;
  -                  jjCheckNAdd(15);
  +               case 646:
  +                  if (curChar == 116)
  +                     jjCheckNAddStates(177, 179);
                     break;
  -               case 19:
  +               case 649:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(340, 341);
  +                  break;
  +               case 650:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(177, 179);
  +                  break;
  +               case 652:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 651;
  +                  break;
  +               case 656:
  +                  if (curChar == 120)
  +                     jjstateSet[jjnewStateCnt++] = 646;
  +                  break;
  +               case 657:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 656;
  +                  break;
  +               case 658:
                     if ((0x7fffffe87fffffeL & l) == 0L)
                        break;
  -                  if (kind > 115)
  -                     kind = 115;
  -                  jjCheckNAddStates(60, 64);
  +                  if (kind > 116)
  +                     kind = 116;
  +                  jjCheckNAddStates(199, 209);
                     break;
  -               case 20:
  +               case 659:
                     if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(20, 21);
  +                     jjCheckNAddTwoStates(659, 660);
                     break;
  -               case 23:
  +               case 662:
                     if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(23, 24);
  +                     jjCheckNAddTwoStates(662, 663);
                     break;
  -               case 25:
  +               case 664:
  +               case 665:
                     if ((0x7fffffe87fffffeL & l) == 0L)
                        break;
  -                  if (kind > 115)
  -                     kind = 115;
  -                  jjCheckNAdd(26);
  +                  if (kind > 116)
  +                     kind = 116;
  +                  jjCheckNAdd(665);
  +                  break;
  +               case 666:
  +                  if ((0x7fffffe87fffffeL & l) != 0L)
  +                     jjCheckNAddTwoStates(666, 667);
  +                  break;
  +               case 668:
  +               case 669:
  +                  if ((0x7fffffe87fffffeL & l) != 0L)
  +                     jjCheckNAddStates(186, 189);
  +                  break;
  +               case 672:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(342, 343);
  +                  break;
  +               case 673:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(190, 192);
  +                  break;
  +               case 675:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 674;
  +                  break;
  +               case 679:
  +                  if (curChar == 118)
  +                     jjAddStates(210, 211);
  +                  break;
  +               case 680:
  +                  if (curChar == 101)
  +                     jjCheckNAddStates(193, 195);
  +                  break;
  +               case 683:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(344, 345);
  +                  break;
  +               case 684:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(193, 195);
  +                  break;
  +               case 686:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 685;
  +                  break;
  +               case 687:
  +                  if (curChar == 123 && kind > 94)
  +                     kind = 94;
  +                  break;
  +               case 690:
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 680;
  +                  break;
  +               case 691:
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 690;
  +                  break;
  +               case 692:
  +                  if (curChar == 100)
  +                     jjstateSet[jjnewStateCnt++] = 691;
  +                  break;
  +               case 693:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 692;
  +                  break;
  +               case 694:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 693;
  +                  break;
  +               case 695:
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 694;
  +                  break;
  +               case 696:
  +                  if (curChar == 101)
  +                     jjCheckNAddTwoStates(697, 702);
  +                  break;
  +               case 699:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(346, 347);
  +                  break;
  +               case 700:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(196, 198);
  +                  break;
  +               case 702:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 701;
  +                  break;
  +               case 703:
  +                  if (curChar == 116 && kind > 95)
  +                     kind = 95;
  +                  break;
  +               case 704:
  +                  if (curChar == 120)
  +                     jjstateSet[jjnewStateCnt++] = 703;
  +                  break;
  +               case 705:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 704;
  +                  break;
  +               case 706:
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 705;
  +                  break;
  +               case 707:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 706;
  +                  break;
  +               case 708:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 707;
  +                  break;
  +               case 709:
  +                  if (curChar == 99)
  +                     jjstateSet[jjnewStateCnt++] = 708;
  +                  break;
  +               case 712:
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 696;
  +                  break;
  +               case 713:
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 712;
  +                  break;
  +               case 714:
  +                  if (curChar == 100)
  +                     jjstateSet[jjnewStateCnt++] = 713;
  +                  break;
  +               case 715:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 714;
                     break;
  -               case 26:
  -                  if ((0x7fffffe87fffffeL & l) == 0L)
  -                     break;
  -                  if (kind > 115)
  -                     kind = 115;
  -                  jjCheckNAdd(26);
  +               case 716:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 715;
  +                  break;
  +               case 717:
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 716;
                     break;
                  default : break;
               }
  @@ -2560,222 +5640,289 @@
            {
               switch(jjstateSet[--i])
               {
  +               case 19:
  +                  if ((jjbitVec5[i2] & l2) == 0L)
  +                     break;
  +                  if (kind > 116)
  +                     kind = 116;
  +                  jjCheckNAddStates(199, 209);
  +                  break;
  +               case 1:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(243, 244);
  +                  break;
  +               case 4:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(245, 246);
  +                  break;
                  case 9:
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(20, 21);
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(23, 24);
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                  {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(26);
  -                  }
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(247, 248);
                     break;
  -               case 11:
  +               case 22:
                     if ((jjbitVec5[i2] & l2) == 0L)
                        break;
  -                  if (kind > 115)
  -                     kind = 115;
  -                  jjCheckNAddStates(60, 64);
  +                  if (kind > 59)
  +                     kind = 59;
  +                  jjCheckNAdd(23);
  +                  break;
  +               case 23:
  +                  if ((jjbitVec28[i2] & l2) == 0L)
  +                     break;
  +                  if (kind > 59)
  +                     kind = 59;
  +                  jjCheckNAdd(23);
                     break;
                  case 27:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(249, 250);
  +                  break;
  +               case 51:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(253, 254);
  +                  break;
  +               case 57:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(255, 256);
  +                  break;
  +               case 70:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(259, 260);
  +                  break;
  +               case 84:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(261, 262);
  +                  break;
  +               case 97:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(263, 264);
  +                  break;
  +               case 113:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(265, 266);
  +                  break;
  +               case 132:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(267, 268);
  +                  break;
  +               case 159:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(269, 270);
  +                  break;
  +               case 166:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(271, 272);
  +                  break;
  +               case 191:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(273, 274);
  +                  break;
  +               case 212:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(275, 276);
  +                  break;
  +               case 234:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(277, 278);
  +                  break;
  +               case 251:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(279, 280);
  +                  break;
  +               case 266:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(281, 282);
  +                  break;
  +               case 292:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(283, 284);
  +                  break;
  +               case 310:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(285, 286);
  +                  break;
  +               case 341:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(287, 288);
  +                  break;
  +               case 359:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(289, 290);
  +                  break;
  +               case 376:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(291, 292);
  +                  break;
  +               case 401:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(293, 294);
  +                  break;
  +               case 405:
  +                  if ((jjbitVec5[i2] & l2) != 0L)
  +                     jjCheckNAddStates(295, 300);
  +                  break;
  +               case 406:
                     if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(20, 21);
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(23, 24);
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                  {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(26);
  -                  }
  +                     jjCheckNAddTwoStates(406, 407);
                     break;
  -               case 10:
  +               case 408:
  +                  if ((jjbitVec5[i2] & l2) != 0L)
  +                     jjCheckNAddStates(120, 123);
  +                  break;
  +               case 409:
                     if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(20, 21);
  +                     jjCheckNAddStates(120, 123);
  +                  break;
  +               case 412:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(301, 302);
  +                  break;
  +               case 431:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(303, 304);
  +                  break;
  +               case 449:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(305, 306);
  +                  break;
  +               case 462:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(307, 308);
  +                  break;
  +               case 475:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(309, 310);
  +                  break;
  +               case 501:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(311, 312);
  +                  break;
  +               case 519:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(313, 314);
  +                  break;
  +               case 531:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(315, 316);
  +                  break;
  +               case 549:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(317, 318);
  +                  break;
  +               case 562:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(319, 320);
  +                  break;
  +               case 566:
  +                  if ((jjbitVec5[i2] & l2) != 0L)
  +                     jjCheckNAddStates(321, 326);
  +                  break;
  +               case 567:
                     if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(23, 24);
  +                     jjCheckNAddTwoStates(567, 568);
  +                  break;
  +               case 569:
  +                  if ((jjbitVec5[i2] & l2) != 0L)
  +                     jjCheckNAddStates(156, 159);
  +                  break;
  +               case 570:
                     if ((jjbitVec28[i2] & l2) != 0L)
  -                  {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(26);
  -                  }
  +                     jjCheckNAddStates(156, 159);
                     break;
  -               case 14:
  -                  if ((jjbitVec5[i2] & l2) == 0L)
  -                     break;
  -                  if (kind > 54)
  -                     kind = 54;
  -                  jjCheckNAdd(15);
  +               case 573:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(327, 328);
                     break;
  -               case 15:
  -                  if ((jjbitVec28[i2] & l2) == 0L)
  -                     break;
  -                  if (kind > 54)
  -                     kind = 54;
  -                  jjCheckNAdd(15);
  +               case 590:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(329, 330);
                     break;
  -               case 20:
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(20, 21);
  +               case 605:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(331, 332);
                     break;
  -               case 23:
  +               case 619:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(333, 334);
  +                  break;
  +               case 623:
  +                  if ((jjbitVec5[i2] & l2) == 0L)
  +                     break;
  +                  if (kind > 52)
  +                     kind = 52;
  +                  jjCheckNAddStates(335, 337);
  +                  break;
  +               case 624:
                     if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(23, 24);
  +                     jjCheckNAddTwoStates(624, 625);
                     break;
  -               case 25:
  +               case 626:
                     if ((jjbitVec5[i2] & l2) == 0L)
                        break;
  -                  if (kind > 115)
  -                     kind = 115;
  -                  jjCheckNAdd(26);
  +                  if (kind > 52)
  +                     kind = 52;
  +                  jjCheckNAdd(627);
                     break;
  -               case 26:
  +               case 627:
                     if ((jjbitVec28[i2] & l2) == 0L)
                        break;
  -                  if (kind > 115)
  -                     kind = 115;
  -                  jjCheckNAdd(26);
  +                  if (kind > 52)
  +                     kind = 52;
  +                  jjCheckNAdd(627);
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      if (kind != 0x7fffffff)
  -      {
  -         jjmatchedKind = kind;
  -         jjmatchedPos = curPos;
  -         kind = 0x7fffffff;
  -      }
  -      ++curPos;
  -      if ((i = jjnewStateCnt) == (startsAt = 27 - (jjnewStateCnt = 
startsAt)))
  -         return curPos;
  -      try { curChar = input_stream.readChar(); }
  -      catch(java.io.IOException e) { return curPos; }
  -   }
  -}
  -private final int jjStopStringLiteralDfa_1(int pos, long active0, long 
active1)
  -{
  -   switch (pos)
  -   {
  -      default :
  -         return -1;
  -   }
  -}
  -private final int jjStartNfa_1(int pos, long active0, long active1)
  -{
  -   return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0, active1), pos + 
1);
  -}
  -private final int jjStartNfaWithStates_1(int pos, int kind, int state)
  -{
  -   jjmatchedKind = kind;
  -   jjmatchedPos = pos;
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) { return pos + 1; }
  -   return jjMoveNfa_1(state, pos + 1);
  -}
  -private final int jjMoveStringLiteralDfa0_1()
  -{
  -   switch(curChar)
  -   {
  -      case 123:
  -         return jjStartNfaWithStates_1(0, 119, 5);
  -      default :
  -         return jjMoveNfa_1(6, 0);
  -   }
  -}
  -private final int jjMoveNfa_1(int startState, int curPos)
  -{
  -   int[] nextStates;
  -   int startsAt = 0;
  -   jjnewStateCnt = 8;
  -   int i = 1;
  -   jjstateSet[0] = startState;
  -   int j, kind = 0x7fffffff;
  -   for (;;)
  -   {
  -      if (++jjround == 0x7fffffff)
  -         ReInitRounds();
  -      if (curChar < 64)
  -      {
  -         long l = 1L << curChar;
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 6:
  -                  if ((0xffffffff00002600L & l) != 0L && kind > 121)
  -                     kind = 121;
  +               case 635:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(338, 339);
                     break;
  -               case 0:
  -                  if (curChar == 45)
  -                     jjCheckNAddTwoStates(1, 4);
  +               case 649:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(340, 341);
                     break;
  -               case 1:
  -                  jjCheckNAddTwoStates(1, 4);
  +               case 659:
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                     jjCheckNAddTwoStates(659, 660);
                     break;
  -               case 3:
  -                  if (curChar == 45)
  -                     jjstateSet[jjnewStateCnt++] = 2;
  +               case 662:
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                     jjCheckNAddTwoStates(662, 663);
                     break;
  -               case 4:
  -                  if (curChar == 45)
  -                     jjstateSet[jjnewStateCnt++] = 3;
  +               case 664:
  +                  if ((jjbitVec5[i2] & l2) == 0L)
  +                     break;
  +                  if (kind > 116)
  +                     kind = 116;
  +                  jjCheckNAdd(665);
                     break;
  -               case 5:
  -                  if (curChar == 45)
  -                     jjstateSet[jjnewStateCnt++] = 0;
  +               case 665:
  +                  if ((jjbitVec28[i2] & l2) == 0L)
  +                     break;
  +                  if (kind > 116)
  +                     kind = 116;
  +                  jjCheckNAdd(665);
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      else if (curChar < 128)
  -      {
  -         long l = 1L << (curChar & 077);
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 6:
  -                  if (kind > 121)
  -                     kind = 121;
  -                  if (curChar == 123)
  -                     jjstateSet[jjnewStateCnt++] = 5;
  +               case 666:
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                     jjCheckNAddTwoStates(666, 667);
                     break;
  -               case 1:
  -                  if ((0xdfffffffffffffffL & l) != 0L)
  -                     jjAddStates(65, 66);
  +               case 668:
  +                  if ((jjbitVec5[i2] & l2) != 0L)
  +                     jjCheckNAddStates(186, 189);
                     break;
  -               case 2:
  -                  if (curChar == 125 && kind > 1)
  -                     kind = 1;
  +               case 669:
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                     jjCheckNAddStates(186, 189);
                     break;
  -               case 7:
  -                  if (kind > 121)
  -                     kind = 121;
  +               case 672:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(342, 343);
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      else
  -      {
  -         int i2 = (curChar & 0xff) >> 6;
  -         long l2 = 1L << (curChar & 077);
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 6:
  -                  if ((jjbitVec2[i2] & l2) != 0L && kind > 121)
  -                     kind = 121;
  +               case 683:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(344, 345);
                     break;
  -               case 1:
  -                  if ((jjbitVec2[i2] & l2) != 0L)
  -                     jjAddStates(65, 66);
  +               case 699:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(346, 347);
                     break;
                  default : break;
               }
  @@ -2788,562 +5935,525 @@
            kind = 0x7fffffff;
         }
         ++curPos;
  -      if ((i = jjnewStateCnt) == (startsAt = 8 - (jjnewStateCnt = startsAt)))
  +      if ((i = jjnewStateCnt) == (startsAt = 718 - (jjnewStateCnt = 
startsAt)))
            return curPos;
         try { curChar = input_stream.readChar(); }
         catch(java.io.IOException e) { return curPos; }
      }
   }
  -private final int jjStopStringLiteralDfa_2(int pos, long active0, long 
active1)
  +private final int jjStopStringLiteralDfa_1(int pos, long active0, long 
active1)
   {
      switch (pos)
      {
         case 0:
  -         if ((active0 & 0x800000L) != 0L)
  -            return 19;
  -         if ((active0 & 0x5000000041200000L) != 0L)
  +         if ((active0 & 0x400000L) != 0L)
            {
  -            jjmatchedKind = 115;
  -            return 9;
  +            jjmatchedKind = 116;
  +            return 42;
            }
  -         if ((active0 & 0x100000L) != 0L)
  +         if ((active0 & 0x20000000L) != 0L)
            {
  -            jjmatchedKind = 115;
  -            return 48;
  +            jjmatchedKind = 116;
  +            return 40;
            }
  -         if ((active0 & 0x2000000L) != 0L)
  +         if ((active0 & 0x40000000L) != 0L)
            {
  -            jjmatchedKind = 115;
  -            return 26;
  +            jjmatchedKind = 116;
  +            return 71;
            }
  -         if ((active0 & 0x400000000L) != 0L)
  +         if ((active0 & 0x1584800000L) != 0L || (active1 & 0x3e00L) != 0L)
            {
  -            jjmatchedKind = 115;
  -            return 38;
  +            jjmatchedKind = 116;
  +            return 231;
            }
  -         if ((active1 & 0x300000000000L) != 0L)
  -            return 81;
  -         if ((active0 & 0x40000L) != 0L)
  +         if ((active0 & 0x1000000L) != 0L)
            {
  -            jjmatchedKind = 115;
  -            return 11;
  +            jjmatchedKind = 116;
  +            return 179;
            }
  -         if ((active0 & 0x8002ac480000L) != 0L || (active1 & 0x20001f0L) != 
0L)
  +         if ((active1 & 0x600000000000L) != 0L)
  +            return 232;
  +         if ((active0 & 0x812000000L) != 0L || (active1 & 0xaL) != 0L)
            {
  -            jjmatchedKind = 115;
  -            return 82;
  +            jjmatchedKind = 116;
  +            return 22;
            }
  -         if ((active0 & 0x110000000L) != 0L || (active1 & 0x8L) != 0L)
  +         if ((active0 & 0x8000000L) != 0L)
  +            return 57;
  +         if ((active1 & 0x80000000000000L) != 0L)
  +            return 136;
  +         if ((active0 & 0x2200000000L) != 0L || (active1 & 0x100L) != 0L)
            {
  -            jjmatchedKind = 115;
  -            return 33;
  +            jjmatchedKind = 116;
  +            return 85;
            }
            return -1;
         case 1:
  -         if ((active0 & 0x41000000L) != 0L)
  -            return 8;
  -         if ((active0 & 0x400000000L) != 0L)
  +         if ((active0 & 0x33e7800000L) != 0L)
            {
               if (jjmatchedPos != 1)
               {
  -               jjmatchedKind = 115;
  +               jjmatchedKind = 116;
                  jjmatchedPos = 1;
               }
  -            return 35;
  -         }
  -         if ((active0 & 0x5000000020040000L) != 0L || (active1 & 0x1f8L) != 
0L)
  -            return 82;
  -         if ((active0 & 0x80039e780000L) != 0L || (active1 & 0x2000000L) != 
0L)
  -         {
  -            if (jjmatchedPos != 1)
  -            {
  -               jjmatchedKind = 115;
  -               jjmatchedPos = 1;
  -            }
  -            return 82;
  +            return 231;
            }
  +         if ((active0 & 0x400400000L) != 0L || (active1 & 0x3f0aL) != 0L)
  +            return 231;
  +         if ((active0 & 0x810000000L) != 0L)
  +            return 21;
            return -1;
         case 2:
  -         if ((active0 & 0x40008007de200000L) != 0L || (active1 & 0x2000000L) 
!= 0L)
  +         if ((active0 & 0x3be2000000L) != 0L || (active1 & 0x8L) != 0L)
            {
  -            jjmatchedKind = 115;
  +            jjmatchedKind = 116;
               jjmatchedPos = 2;
  -            return 82;
  +            return 231;
            }
  -         if ((active0 & 0x580000L) != 0L)
  -            return 82;
  +         if ((active0 & 0x5800000L) != 0L)
  +            return 231;
            return -1;
         case 3:
  -         if ((active0 & 0x800018200000L) != 0L)
  -            return 82;
  -         if ((active0 & 0x40000007c6000000L) != 0L || (active1 & 0x2000000L) 
!= 0L)
  +         if ((active0 & 0x38e0000000L) != 0L || (active1 & 0x8L) != 0L)
            {
  -            jjmatchedKind = 115;
  +            jjmatchedKind = 116;
               jjmatchedPos = 3;
  -            return 82;
  +            return 231;
            }
  +         if ((active0 & 0x302000000L) != 0L)
  +            return 231;
            return -1;
         case 4:
  -         if ((active0 & 0x4000000080000000L) != 0L)
  -            return 82;
  -         if ((active0 & 0x746000000L) != 0L || (active1 & 0x2000000L) != 0L)
  +         if ((active0 & 0x28e0000000L) != 0L)
            {
  -            jjmatchedKind = 115;
  +            jjmatchedKind = 116;
               jjmatchedPos = 4;
  -            return 82;
  +            return 231;
            }
  +         if ((active0 & 0x1000000000L) != 0L || (active1 & 0x8L) != 0L)
  +            return 231;
            return -1;
         case 5:
  -         if ((active0 & 0x104000000L) != 0L)
  -            return 82;
  -         if ((active0 & 0x642000000L) != 0L || (active1 & 0x2000000L) != 0L)
  +         if ((active0 & 0x860000000L) != 0L)
            {
  -            jjmatchedKind = 115;
  +            jjmatchedKind = 116;
               jjmatchedPos = 5;
  -            return 82;
  +            return 231;
            }
  +         if ((active0 & 0x2080000000L) != 0L)
  +            return 231;
            return -1;
         case 6:
  -         if ((active0 & 0x400000000L) != 0L)
  -            return 82;
  -         if ((active0 & 0x242000000L) != 0L || (active1 & 0x2000000L) != 0L)
  +         if ((active0 & 0x20000000L) != 0L)
  +            return 231;
  +         if ((active0 & 0x840000000L) != 0L)
            {
  -            jjmatchedKind = 115;
  +            jjmatchedKind = 116;
               jjmatchedPos = 6;
  -            return 82;
  +            return 231;
            }
            return -1;
         case 7:
  -         if ((active0 & 0x200000000L) != 0L || (active1 & 0x2000000L) != 0L)
  -            return 82;
  -         if ((active0 & 0x42000000L) != 0L)
  +         if ((active0 & 0x840000000L) != 0L)
            {
  -            jjmatchedKind = 115;
  +            jjmatchedKind = 116;
               jjmatchedPos = 7;
  -            return 82;
  +            return 231;
            }
            return -1;
         default :
            return -1;
      }
   }
  -private final int jjStartNfa_2(int pos, long active0, long active1)
  +private final int jjStartNfa_1(int pos, long active0, long active1)
   {
  -   return jjMoveNfa_2(jjStopStringLiteralDfa_2(pos, active0, active1), pos + 
1);
  +   return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0, active1), pos + 
1);
   }
  -private final int jjStartNfaWithStates_2(int pos, int kind, int state)
  +private final int jjStartNfaWithStates_1(int pos, int kind, int state)
   {
      jjmatchedKind = kind;
      jjmatchedPos = pos;
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) { return pos + 1; }
  -   return jjMoveNfa_2(state, pos + 1);
  +   return jjMoveNfa_1(state, pos + 1);
   }
  -private final int jjMoveStringLiteralDfa0_2()
  +private final int jjMoveStringLiteralDfa0_1()
   {
      switch(curChar)
      {
         case 33:
  -         return jjMoveStringLiteralDfa1_2(0x2000000000000000L, 0x0L);
  +         return jjMoveStringLiteralDfa1_1(0x0L, 0x4L);
         case 36:
  -         return jjStopAtPos(0, 113);
  +         return jjStopAtPos(0, 114);
         case 40:
  -         return jjStopAtPos(0, 79);
  +         return jjStopAtPos(0, 84);
         case 41:
  -         return jjStopAtPos(0, 83);
  +         return jjStopAtPos(0, 88);
         case 42:
  -         return jjStartNfaWithStates_2(0, 23, 19);
  +         return jjStartNfaWithStates_1(0, 27, 57);
         case 43:
  -         return jjStopAtPos(0, 76);
  +         return jjStopAtPos(0, 81);
         case 44:
  -         return jjStopAtPos(0, 105);
  +         return jjStopAtPos(0, 108);
         case 45:
  -         return jjStopAtPos(0, 75);
  +         return jjStopAtPos(0, 80);
         case 46:
  -         jjmatchedKind = 108;
  -         return jjMoveStringLiteralDfa1_2(0x0L, 0x200000000000L);
  +         jjmatchedKind = 109;
  +         return jjMoveStringLiteralDfa1_1(0x0L, 0x400000000000L);
         case 47:
  -         jjmatchedKind = 57;
  -         return jjMoveStringLiteralDfa1_2(0x400000000000000L, 0x0L);
  +         jjmatchedKind = 62;
  +         return jjMoveStringLiteralDfa1_1(0x8000000000000000L, 0x0L);
         case 60:
  -         jjmatchedKind = 73;
  -         return jjMoveStringLiteralDfa1_2(0x8000000000000000L, 0x1L);
  +         jjmatchedKind = 78;
  +         return jjMoveStringLiteralDfa1_1(0x0L, 0x30L);
         case 61:
  -         return jjStopAtPos(0, 59);
  +         return jjStopAtPos(0, 64);
         case 62:
  -         jjmatchedKind = 74;
  -         return jjMoveStringLiteralDfa1_2(0x0L, 0x6L);
  +         jjmatchedKind = 79;
  +         return jjMoveStringLiteralDfa1_1(0x0L, 0xc0L);
         case 63:
  -         return jjStopAtPos(0, 77);
  +         return jjStopAtPos(0, 82);
         case 91:
  -         return jjStopAtPos(0, 81);
  +         return jjStopAtPos(0, 86);
         case 93:
  -         return jjStopAtPos(0, 82);
  +         return jjStopAtPos(0, 87);
         case 97:
  -         return jjMoveStringLiteralDfa1_2(0x80000L, 0x0L);
  +         return jjMoveStringLiteralDfa1_1(0x800000L, 0x0L);
  +      case 99:
  +         return jjMoveStringLiteralDfa1_1(0x20000000L, 0x0L);
         case 100:
  -         return jjMoveStringLiteralDfa1_2(0x100000L, 0x0L);
  +         return jjMoveStringLiteralDfa1_1(0x1000000L, 0x0L);
         case 101:
  -         return jjMoveStringLiteralDfa1_2(0x110000000L, 0x8L);
  -      case 102:
  -         return jjMoveStringLiteralDfa1_2(0x400000000L, 0x0L);
  +         return jjMoveStringLiteralDfa1_1(0x2200000000L, 0x100L);
         case 103:
  -         return jjMoveStringLiteralDfa1_2(0x0L, 0x60L);
  +         return jjMoveStringLiteralDfa1_1(0x0L, 0xc00L);
         case 105:
  -         return jjMoveStringLiteralDfa1_2(0x5000000041200000L, 0x0L);
  +         return jjMoveStringLiteralDfa1_1(0x812000000L, 0xaL);
         case 108:
  -         return jjMoveStringLiteralDfa1_2(0x0L, 0x180L);
  +         return jjMoveStringLiteralDfa1_1(0x0L, 0x3000L);
         case 109:
  -         return jjMoveStringLiteralDfa1_2(0x400000L, 0x0L);
  +         return jjMoveStringLiteralDfa1_1(0x4000000L, 0x0L);
         case 110:
  -         return jjMoveStringLiteralDfa1_2(0x0L, 0x10L);
  +         return jjMoveStringLiteralDfa1_1(0x0L, 0x200L);
         case 111:
  -         return jjMoveStringLiteralDfa1_2(0x40000L, 0x0L);
  -      case 112:
  -         return jjMoveStringLiteralDfa1_2(0x200000000L, 0x0L);
  +         return jjMoveStringLiteralDfa1_1(0x400000L, 0x0L);
         case 114:
  -         return jjMoveStringLiteralDfa1_2(0x4000000L, 0x0L);
  +         return jjMoveStringLiteralDfa1_1(0x80000000L, 0x0L);
         case 115:
  -         return jjMoveStringLiteralDfa1_2(0x2000000L, 0x0L);
  +         return jjMoveStringLiteralDfa1_1(0x40000000L, 0x0L);
         case 116:
  -         return jjMoveStringLiteralDfa1_2(0x800028000000L, 0x0L);
  +         return jjMoveStringLiteralDfa1_1(0x500000000L, 0x0L);
         case 117:
  -         return jjMoveStringLiteralDfa1_2(0x80000000L, 0x0L);
  -      case 118:
  -         return jjMoveStringLiteralDfa1_2(0x0L, 0x2000000L);
  +         return jjMoveStringLiteralDfa1_1(0x1000000000L, 0x0L);
  +      case 123:
  +         return jjStartNfaWithStates_1(0, 119, 136);
         case 124:
  -         return jjStopAtPos(0, 78);
  +         return jjStopAtPos(0, 83);
         case 125:
            return jjStopAtPos(0, 120);
         default :
  -         return jjMoveNfa_2(10, 0);
  +         return jjMoveNfa_1(23, 0);
      }
   }
  -private final int jjMoveStringLiteralDfa1_2(long active0, long active1)
  +private final int jjMoveStringLiteralDfa1_1(long active0, long active1)
   {
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_2(0, active0, active1);
  +      jjStopStringLiteralDfa_1(0, active0, active1);
         return 1;
      }
      switch(curChar)
      {
         case 46:
  -         if ((active1 & 0x200000000000L) != 0L)
  -            return jjStopAtPos(1, 109);
  +         if ((active1 & 0x400000000000L) != 0L)
  +            return jjStopAtPos(1, 110);
            break;
         case 47:
  -         if ((active0 & 0x400000000000000L) != 0L)
  -            return jjStopAtPos(1, 58);
  +         if ((active0 & 0x8000000000000000L) != 0L)
  +            return jjStopAtPos(1, 63);
            break;
         case 60:
  -         if ((active1 & 0x1L) != 0L)
  -            return jjStopAtPos(1, 64);
  +         if ((active1 & 0x20L) != 0L)
  +            return jjStopAtPos(1, 69);
            break;
         case 61:
  -         if ((active0 & 0x2000000000000000L) != 0L)
  -            return jjStopAtPos(1, 61);
  -         else if ((active0 & 0x8000000000000000L) != 0L)
  -            return jjStopAtPos(1, 63);
  -         else if ((active1 & 0x2L) != 0L)
  -            return jjStopAtPos(1, 65);
  -         break;
  -      case 62:
            if ((active1 & 0x4L) != 0L)
               return jjStopAtPos(1, 66);
  +         else if ((active1 & 0x10L) != 0L)
  +            return jjStopAtPos(1, 68);
  +         else if ((active1 & 0x40L) != 0L)
  +            return jjStopAtPos(1, 70);
  +         break;
  +      case 62:
  +         if ((active1 & 0x80L) != 0L)
  +            return jjStopAtPos(1, 71);
            break;
         case 97:
  -         return jjMoveStringLiteralDfa2_2(active0, 0x2000000L, active1, 
0x2000000L);
  +         return jjMoveStringLiteralDfa2_1(active0, 0x40000000L, active1, 0L);
         case 100:
  -         return jjMoveStringLiteralDfa2_2(active0, 0x200000L, active1, 0L);
  +         return jjMoveStringLiteralDfa2_1(active0, 0x2000000L, active1, 0L);
         case 101:
  -         if ((active1 & 0x10L) != 0L)
  -            return jjStartNfaWithStates_2(1, 68, 82);
  -         else if ((active1 & 0x40L) != 0L)
  -            return jjStartNfaWithStates_2(1, 70, 82);
  -         else if ((active1 & 0x100L) != 0L)
  -            return jjStartNfaWithStates_2(1, 72, 82);
  -         return jjMoveStringLiteralDfa2_2(active0, 0x4000000L, active1, 0L);
  +         if ((active1 & 0x200L) != 0L)
  +            return jjStartNfaWithStates_1(1, 73, 231);
  +         else if ((active1 & 0x800L) != 0L)
  +            return jjStartNfaWithStates_1(1, 75, 231);
  +         else if ((active1 & 0x2000L) != 0L)
  +            return jjStartNfaWithStates_1(1, 77, 231);
  +         return jjMoveStringLiteralDfa2_1(active0, 0x80000000L, active1, 0L);
         case 104:
  -         return jjMoveStringLiteralDfa2_2(active0, 0x8000000L, active1, 0L);
  +         return jjMoveStringLiteralDfa2_1(active0, 0x100000000L, active1, 
0L);
         case 105:
  -         return jjMoveStringLiteralDfa2_2(active0, 0x100000L, active1, 0L);
  +         return jjMoveStringLiteralDfa2_1(active0, 0x1000000L, active1, 0L);
         case 108:
  -         return jjMoveStringLiteralDfa2_2(active0, 0x10000000L, active1, 0L);
  +         return jjMoveStringLiteralDfa2_1(active0, 0x200000000L, active1, 
0L);
         case 110:
  -         if ((active0 & 0x1000000L) != 0L)
  +         if ((active0 & 0x10000000L) != 0L)
            {
  -            jjmatchedKind = 24;
  +            jjmatchedKind = 28;
               jjmatchedPos = 1;
            }
  -         return jjMoveStringLiteralDfa2_2(active0, 0xc0080000L, active1, 0L);
  +         return jjMoveStringLiteralDfa2_1(active0, 0x1800800000L, active1, 
0L);
         case 111:
  -         if ((active0 & 0x20000000L) != 0L)
  -            return jjStartNfaWithStates_2(1, 29, 82);
  -         return jjMoveStringLiteralDfa2_2(active0, 0x400400000L, active1, 
0L);
  +         if ((active0 & 0x400000000L) != 0L)
  +            return jjStartNfaWithStates_1(1, 34, 231);
  +         return jjMoveStringLiteralDfa2_1(active0, 0x24000000L, active1, 0L);
         case 113:
  -         if ((active1 & 0x8L) != 0L)
  -            return jjStartNfaWithStates_2(1, 67, 82);
  +         if ((active1 & 0x100L) != 0L)
  +            return jjStartNfaWithStates_1(1, 72, 231);
            break;
         case 114:
  -         if ((active0 & 0x40000L) != 0L)
  -            return jjStartNfaWithStates_2(1, 18, 82);
  -         return jjMoveStringLiteralDfa2_2(active0, 0x200000000L, active1, 
0L);
  +         if ((active0 & 0x400000L) != 0L)
  +            return jjStartNfaWithStates_1(1, 22, 231);
  +         break;
         case 115:
  -         if ((active0 & 0x1000000000000000L) != 0L)
  +         if ((active1 & 0x2L) != 0L)
            {
  -            jjmatchedKind = 60;
  +            jjmatchedKind = 65;
               jjmatchedPos = 1;
            }
  -         return jjMoveStringLiteralDfa2_2(active0, 0x4000000000000000L, 
active1, 0L);
  +         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x8L);
         case 116:
  -         if ((active1 & 0x20L) != 0L)
  -            return jjStartNfaWithStates_2(1, 69, 82);
  -         else if ((active1 & 0x80L) != 0L)
  -            return jjStartNfaWithStates_2(1, 71, 82);
  +         if ((active1 & 0x400L) != 0L)
  +            return jjStartNfaWithStates_1(1, 74, 231);
  +         else if ((active1 & 0x1000L) != 0L)
  +            return jjStartNfaWithStates_1(1, 76, 231);
            break;
         case 120:
  -         return jjMoveStringLiteralDfa2_2(active0, 0x100000000L, active1, 
0L);
  -      case 121:
  -         return jjMoveStringLiteralDfa2_2(active0, 0x800000000000L, active1, 
0L);
  +         return jjMoveStringLiteralDfa2_1(active0, 0x2000000000L, active1, 
0L);
         default :
            break;
      }
  -   return jjStartNfa_2(0, active0, active1);
  +   return jjStartNfa_1(0, active0, active1);
   }
  -private final int jjMoveStringLiteralDfa2_2(long old0, long active0, long 
old1, long active1)
  +private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long 
old1, long active1)
   {
      if (((active0 &= old0) | (active1 &= old1)) == 0L)
  -      return jjStartNfa_2(0, old0, old1); 
  +      return jjStartNfa_1(0, old0, old1); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_2(1, active0, active1);
  +      jjStopStringLiteralDfa_1(1, active0, active1);
         return 2;
      }
      switch(curChar)
      {
         case 99:
  -         return jjMoveStringLiteralDfa3_2(active0, 0x100000000L, active1, 
0L);
  +         return jjMoveStringLiteralDfa3_1(active0, 0x2000000000L, active1, 
0L);
         case 100:
  -         if ((active0 & 0x80000L) != 0L)
  -            return jjStartNfaWithStates_2(2, 19, 82);
  -         else if ((active0 & 0x400000L) != 0L)
  -            return jjStartNfaWithStates_2(2, 22, 82);
  +         if ((active0 & 0x800000L) != 0L)
  +            return jjStartNfaWithStates_1(2, 23, 231);
  +         else if ((active0 & 0x4000000L) != 0L)
  +            return jjStartNfaWithStates_1(2, 26, 231);
            break;
         case 101:
  -         return jjMoveStringLiteralDfa3_2(active0, 0x208000000L, active1, 
0L);
  +         return jjMoveStringLiteralDfa3_1(active0, 0x100000000L, active1, 
0L);
         case 105:
  -         return jjMoveStringLiteralDfa3_2(active0, 0x80200000L, active1, 0L);
  -      case 108:
  -         return jjMoveStringLiteralDfa3_2(active0, 0x400000000L, active1, 
0x2000000L);
  +         return jjMoveStringLiteralDfa3_1(active0, 0x1002000000L, active1, 
0L);
         case 110:
  -         return jjMoveStringLiteralDfa3_2(active0, 0x4000000000000000L, 
active1, 0L);
  -      case 112:
  -         return jjMoveStringLiteralDfa3_2(active0, 0x800000000000L, active1, 
0L);
  +         return jjMoveStringLiteralDfa3_1(active0, 0x20000000L, active1, 
0x8L);
         case 115:
  -         return jjMoveStringLiteralDfa3_2(active0, 0x10000000L, active1, 0L);
  +         return jjMoveStringLiteralDfa3_1(active0, 0x200000000L, active1, 
0L);
         case 116:
  -         return jjMoveStringLiteralDfa3_2(active0, 0x46000000L, active1, 0L);
  +         return jjMoveStringLiteralDfa3_1(active0, 0x8c0000000L, active1, 
0L);
         case 118:
  -         if ((active0 & 0x100000L) != 0L)
  -            return jjStartNfaWithStates_2(2, 20, 82);
  +         if ((active0 & 0x1000000L) != 0L)
  +            return jjStartNfaWithStates_1(2, 24, 231);
            break;
         default :
            break;
      }
  -   return jjStartNfa_2(1, active0, active1);
  +   return jjStartNfa_1(1, active0, active1);
   }
  -private final int jjMoveStringLiteralDfa3_2(long old0, long active0, long 
old1, long active1)
  +private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long 
old1, long active1)
   {
      if (((active0 &= old0) | (active1 &= old1)) == 0L)
  -      return jjStartNfa_2(1, old0, old1); 
  +      return jjStartNfa_1(1, old0, old1); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_2(2, active0, active1);
  +      jjStopStringLiteralDfa_1(2, active0, active1);
         return 3;
      }
      switch(curChar)
      {
  -      case 99:
  -         return jjMoveStringLiteralDfa4_2(active0, 0x200000000L, active1, 
0L);
         case 101:
  -         if ((active0 & 0x10000000L) != 0L)
  -            return jjStartNfaWithStates_2(3, 28, 82);
  -         else if ((active0 & 0x800000000000L) != 0L)
  -            return jjStartNfaWithStates_2(3, 47, 82);
  -         return jjMoveStringLiteralDfa4_2(active0, 0x140000000L, active1, 
0L);
  +         if ((active0 & 0x200000000L) != 0L)
  +            return jjStartNfaWithStates_1(3, 33, 231);
  +         return jjMoveStringLiteralDfa4_1(active0, 0x2800000000L, active1, 
0L);
         case 105:
  -         return jjMoveStringLiteralDfa4_2(active0, 0x2000000L, active1, 
0x2000000L);
  -      case 108:
  -         return jjMoveStringLiteralDfa4_2(active0, 0x400000000L, active1, 
0L);
  +         return jjMoveStringLiteralDfa4_1(active0, 0x40000000L, active1, 0L);
         case 110:
  -         if ((active0 & 0x8000000L) != 0L)
  -            return jjStartNfaWithStates_2(3, 27, 82);
  +         if ((active0 & 0x100000000L) != 0L)
  +            return jjStartNfaWithStates_1(3, 32, 231);
            break;
         case 111:
  -         return jjMoveStringLiteralDfa4_2(active0, 0x4000000080000000L, 
active1, 0L);
  +         return jjMoveStringLiteralDfa4_1(active0, 0x1000000000L, active1, 
0x8L);
  +      case 116:
  +         return jjMoveStringLiteralDfa4_1(active0, 0x20000000L, active1, 0L);
         case 117:
  -         return jjMoveStringLiteralDfa4_2(active0, 0x4000000L, active1, 0L);
  +         return jjMoveStringLiteralDfa4_1(active0, 0x80000000L, active1, 0L);
         case 118:
  -         if ((active0 & 0x200000L) != 0L)
  -            return jjStartNfaWithStates_2(3, 21, 82);
  +         if ((active0 & 0x2000000L) != 0L)
  +            return jjStartNfaWithStates_1(3, 25, 231);
            break;
         default :
            break;
      }
  -   return jjStartNfa_2(2, active0, active1);
  +   return jjStartNfa_1(2, active0, active1);
   }
  -private final int jjMoveStringLiteralDfa4_2(long old0, long active0, long 
old1, long active1)
  +private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long 
old1, long active1)
   {
      if (((active0 &= old0) | (active1 &= old1)) == 0L)
  -      return jjStartNfa_2(2, old0, old1); 
  +      return jjStartNfa_1(2, old0, old1); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_2(3, active0, active1);
  +      jjStopStringLiteralDfa_1(3, active0, active1);
         return 4;
      }
      switch(curChar)
      {
  -      case 100:
  -         return jjMoveStringLiteralDfa5_2(active0, 0L, active1, 0x2000000L);
         case 101:
  -         return jjMoveStringLiteralDfa5_2(active0, 0x200000000L, active1, 
0L);
  +         return jjMoveStringLiteralDfa5_1(active0, 0x20000000L, active1, 0L);
         case 110:
  -         if ((active0 & 0x80000000L) != 0L)
  -            return jjStartNfaWithStates_2(4, 31, 82);
  +         if ((active0 & 0x1000000000L) != 0L)
  +            return jjStartNfaWithStates_1(4, 36, 231);
            break;
  -      case 111:
  -         return jjMoveStringLiteralDfa5_2(active0, 0x400000000L, active1, 
0L);
         case 112:
  -         return jjMoveStringLiteralDfa5_2(active0, 0x100000000L, active1, 
0L);
  +         return jjMoveStringLiteralDfa5_1(active0, 0x2000000000L, active1, 
0L);
         case 114:
  -         return jjMoveStringLiteralDfa5_2(active0, 0x44000000L, active1, 0L);
  +         return jjMoveStringLiteralDfa5_1(active0, 0x880000000L, active1, 
0L);
         case 115:
  -         return jjMoveStringLiteralDfa5_2(active0, 0x2000000L, active1, 0L);
  +         return jjMoveStringLiteralDfa5_1(active0, 0x40000000L, active1, 0L);
         case 116:
  -         if ((active0 & 0x4000000000000000L) != 0L)
  -            return jjStartNfaWithStates_2(4, 62, 82);
  +         if ((active1 & 0x8L) != 0L)
  +            return jjStartNfaWithStates_1(4, 67, 231);
            break;
         default :
            break;
      }
  -   return jjStartNfa_2(3, active0, active1);
  +   return jjStartNfa_1(3, active0, active1);
   }
  -private final int jjMoveStringLiteralDfa5_2(long old0, long active0, long 
old1, long active1)
  +private final int jjMoveStringLiteralDfa5_1(long old0, long active0, long 
old1, long active1)
   {
      if (((active0 &= old0) | (active1 &= old1)) == 0L)
  -      return jjStartNfa_2(3, old0, old1); 
  +      return jjStartNfa_1(3, old0, old1); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_2(4, active0, active1);
  +      jjStopStringLiteralDfa_1(4, active0, 0L);
         return 5;
      }
      switch(curChar)
      {
  -      case 97:
  -         return jjMoveStringLiteralDfa6_2(active0, 0L, active1, 0x2000000L);
  -      case 100:
  -         return jjMoveStringLiteralDfa6_2(active0, 0x200000000L, active1, 
0L);
         case 102:
  -         return jjMoveStringLiteralDfa6_2(active0, 0x2000000L, active1, 0L);
  +         return jjMoveStringLiteralDfa6_1(active0, 0x40000000L);
         case 110:
  -         if ((active0 & 0x4000000L) != 0L)
  -            return jjStartNfaWithStates_2(5, 26, 82);
  +         if ((active0 & 0x80000000L) != 0L)
  +            return jjStartNfaWithStates_1(5, 31, 231);
            break;
         case 115:
  -         return jjMoveStringLiteralDfa6_2(active0, 0x40000000L, active1, 0L);
  +         return jjMoveStringLiteralDfa6_1(active0, 0x800000000L);
         case 116:
  -         if ((active0 & 0x100000000L) != 0L)
  -            return jjStartNfaWithStates_2(5, 32, 82);
  +         if ((active0 & 0x2000000000L) != 0L)
  +            return jjStartNfaWithStates_1(5, 37, 231);
            break;
  -      case 119:
  -         return jjMoveStringLiteralDfa6_2(active0, 0x400000000L, active1, 
0L);
  +      case 120:
  +         return jjMoveStringLiteralDfa6_1(active0, 0x20000000L);
         default :
            break;
      }
  -   return jjStartNfa_2(4, active0, active1);
  +   return jjStartNfa_1(4, active0, 0L);
   }
  -private final int jjMoveStringLiteralDfa6_2(long old0, long active0, long 
old1, long active1)
  +private final int jjMoveStringLiteralDfa6_1(long old0, long active0)
   {
  -   if (((active0 &= old0) | (active1 &= old1)) == 0L)
  -      return jjStartNfa_2(4, old0, old1); 
  +   if (((active0 &= old0)) == 0L)
  +      return jjStartNfa_1(4, old0, 0L);
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_2(5, active0, active1);
  +      jjStopStringLiteralDfa_1(5, active0, 0L);
         return 6;
      }
      switch(curChar)
      {
         case 101:
  -         return jjMoveStringLiteralDfa7_2(active0, 0x240000000L, active1, 
0L);
  +         return jjMoveStringLiteralDfa7_1(active0, 0x800000000L);
         case 105:
  -         return jjMoveStringLiteralDfa7_2(active0, 0x2000000L, active1, 0L);
  -      case 115:
  -         if ((active0 & 0x400000000L) != 0L)
  -            return jjStartNfaWithStates_2(6, 34, 82);
  -         break;
  +         return jjMoveStringLiteralDfa7_1(active0, 0x40000000L);
         case 116:
  -         return jjMoveStringLiteralDfa7_2(active0, 0L, active1, 0x2000000L);
  +         if ((active0 & 0x20000000L) != 0L)
  +            return jjStartNfaWithStates_1(6, 29, 231);
  +         break;
         default :
            break;
      }
  -   return jjStartNfa_2(5, active0, active1);
  +   return jjStartNfa_1(5, active0, 0L);
   }
  -private final int jjMoveStringLiteralDfa7_2(long old0, long active0, long 
old1, long active1)
  +private final int jjMoveStringLiteralDfa7_1(long old0, long active0)
   {
  -   if (((active0 &= old0) | (active1 &= old1)) == 0L)
  -      return jjStartNfa_2(5, old0, old1); 
  +   if (((active0 &= old0)) == 0L)
  +      return jjStartNfa_1(5, old0, 0L);
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_2(6, active0, active1);
  +      jjStopStringLiteralDfa_1(6, active0, 0L);
         return 7;
      }
      switch(curChar)
      {
         case 99:
  -         return jjMoveStringLiteralDfa8_2(active0, 0x40000000L, active1, 0L);
  +         return jjMoveStringLiteralDfa8_1(active0, 0x800000000L);
         case 101:
  -         if ((active1 & 0x2000000L) != 0L)
  -            return jjStartNfaWithStates_2(7, 89, 82);
  -         return jjMoveStringLiteralDfa8_2(active0, 0x2000000L, active1, 0L);
  -      case 115:
  -         if ((active0 & 0x200000000L) != 0L)
  -            return jjStartNfaWithStates_2(7, 33, 82);
  -         break;
  +         return jjMoveStringLiteralDfa8_1(active0, 0x40000000L);
         default :
            break;
      }
  -   return jjStartNfa_2(6, active0, active1);
  +   return jjStartNfa_1(6, active0, 0L);
   }
  -private final int jjMoveStringLiteralDfa8_2(long old0, long active0, long 
old1, long active1)
  +private final int jjMoveStringLiteralDfa8_1(long old0, long active0)
   {
  -   if (((active0 &= old0) | (active1 &= old1)) == 0L)
  -      return jjStartNfa_2(6, old0, old1); 
  +   if (((active0 &= old0)) == 0L)
  +      return jjStartNfa_1(6, old0, 0L);
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_2(7, active0, 0L);
  +      jjStopStringLiteralDfa_1(7, active0, 0L);
         return 8;
      }
      switch(curChar)
      {
         case 115:
  -         if ((active0 & 0x2000000L) != 0L)
  -            return jjStartNfaWithStates_2(8, 25, 82);
  +         if ((active0 & 0x40000000L) != 0L)
  +            return jjStartNfaWithStates_1(8, 30, 231);
            break;
         case 116:
  -         if ((active0 & 0x40000000L) != 0L)
  -            return jjStartNfaWithStates_2(8, 30, 82);
  +         if ((active0 & 0x800000000L) != 0L)
  +            return jjStartNfaWithStates_1(8, 35, 231);
            break;
         default :
            break;
      }
  -   return jjStartNfa_2(7, active0, 0L);
  +   return jjStartNfa_1(7, active0, 0L);
   }
  -private final int jjMoveNfa_2(int startState, int curPos)
  +private final int jjMoveNfa_1(int startState, int curPos)
   {
      int[] nextStates;
      int startsAt = 0;
  -   jjnewStateCnt = 81;
  +   jjnewStateCnt = 231;
      int i = 1;
      jjstateSet[0] = startState;
      int j, kind = 0x7fffffff;
  @@ -3358,380 +6468,637 @@
            {
               switch(jjstateSet[--i])
               {
  -               case 38:
  +               case 179:
                     if ((0x3ff600000000000L & l) != 0L)
                     {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(66);
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(230);
                     }
                     else if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 65;
  +                     jjstateSet[jjnewStateCnt++] = 229;
                     if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(63, 64);
  +                     jjCheckNAddTwoStates(227, 228);
                     else if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 62;
  +                     jjstateSet[jjnewStateCnt++] = 226;
                     if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(60, 61);
  +                     jjCheckNAddTwoStates(224, 225);
                     break;
  -               case 9:
  +               case 23:
  +                  if ((0x3ff000000000000L & l) != 0L)
  +                  {
  +                     if (kind > 1)
  +                        kind = 1;
  +                     jjCheckNAddStates(348, 353);
  +                  }
  +                  else if ((0x100002600L & l) != 0L)
  +                  {
  +                     if (kind > 6)
  +                        kind = 6;
  +                     jjCheckNAddStates(354, 356);
  +                  }
  +                  else if (curChar == 46)
  +                     jjCheckNAddTwoStates(128, 129);
  +                  else if (curChar == 42)
  +                     jjstateSet[jjnewStateCnt++] = 57;
  +                  else if (curChar == 39)
  +                     jjCheckNAddTwoStates(4, 5);
  +                  else if (curChar == 34)
  +                     jjCheckNAddTwoStates(1, 2);
  +                  break;
  +               case 231:
                     if ((0x3ff600000000000L & l) != 0L)
                     {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(66);
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(230);
                     }
                     else if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 65;
  +                     jjstateSet[jjnewStateCnt++] = 229;
                     if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(63, 64);
  +                     jjCheckNAddTwoStates(227, 228);
                     else if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 62;
  +                     jjstateSet[jjnewStateCnt++] = 226;
                     if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(60, 61);
  +                     jjCheckNAddTwoStates(224, 225);
                     break;
  -               case 11:
  +               case 21:
                     if ((0x3ff600000000000L & l) != 0L)
                     {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(66);
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(230);
                     }
                     else if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 65;
  +                     jjstateSet[jjnewStateCnt++] = 229;
                     if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(63, 64);
  +                     jjCheckNAddTwoStates(227, 228);
                     else if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 62;
  +                     jjstateSet[jjnewStateCnt++] = 226;
                     if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(60, 61);
  +                     jjCheckNAddTwoStates(224, 225);
                     break;
  -               case 33:
  +               case 71:
                     if ((0x3ff600000000000L & l) != 0L)
                     {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(66);
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(230);
                     }
                     else if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 65;
  +                     jjstateSet[jjnewStateCnt++] = 229;
                     if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(63, 64);
  +                     jjCheckNAddTwoStates(227, 228);
                     else if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 62;
  +                     jjstateSet[jjnewStateCnt++] = 226;
                     if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(60, 61);
  -                  break;
  -               case 10:
  -                  if ((0x3ff000000000000L & l) != 0L)
  -                  {
  -                     if (kind > 91)
  -                        kind = 91;
  -                     jjCheckNAddStates(67, 72);
  -                  }
  -                  else if ((0x100002600L & l) != 0L)
  -                  {
  -                     if (kind > 2)
  -                        kind = 2;
  -                     jjCheckNAddTwoStates(57, 58);
  -                  }
  -                  else if (curChar == 46)
  -                     jjCheckNAddTwoStates(79, 80);
  -                  else if (curChar == 39)
  -                     jjCheckNAddTwoStates(54, 55);
  -                  else if (curChar == 34)
  -                     jjCheckNAddTwoStates(51, 52);
  -                  else if (curChar == 42)
  -                     jjstateSet[jjnewStateCnt++] = 19;
  +                     jjCheckNAddTwoStates(224, 225);
                     break;
  -               case 35:
  +               case 85:
                     if ((0x3ff600000000000L & l) != 0L)
                     {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(66);
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(230);
                     }
                     else if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 65;
  +                     jjstateSet[jjnewStateCnt++] = 229;
                     if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(63, 64);
  +                     jjCheckNAddTwoStates(227, 228);
                     else if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 62;
  +                     jjstateSet[jjnewStateCnt++] = 226;
                     if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(60, 61);
  +                     jjCheckNAddTwoStates(224, 225);
                     break;
  -               case 81:
  +               case 232:
                     if ((0x3ff000000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(80, 75);
  +                     jjCheckNAddTwoStates(129, 124);
                     if ((0x3ff000000000000L & l) != 0L)
                     {
  -                     if (kind > 92)
  -                        kind = 92;
  -                     jjCheckNAdd(79);
  +                     if (kind > 2)
  +                        kind = 2;
  +                     jjCheckNAdd(128);
                     }
                     break;
  -               case 82:
  +               case 42:
                     if ((0x3ff600000000000L & l) != 0L)
                     {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(66);
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(230);
                     }
                     else if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 65;
  +                     jjstateSet[jjnewStateCnt++] = 229;
                     if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(63, 64);
  +                     jjCheckNAddTwoStates(227, 228);
                     else if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 62;
  +                     jjstateSet[jjnewStateCnt++] = 226;
                     if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(60, 61);
  +                     jjCheckNAddTwoStates(224, 225);
                     break;
  -               case 8:
  +               case 136:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 137;
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 131;
  +                  break;
  +               case 40:
                     if ((0x3ff600000000000L & l) != 0L)
                     {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(66);
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(230);
                     }
                     else if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 65;
  +                     jjstateSet[jjnewStateCnt++] = 229;
                     if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(63, 64);
  +                     jjCheckNAddTwoStates(227, 228);
                     else if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 62;
  +                     jjstateSet[jjnewStateCnt++] = 226;
                     if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(60, 61);
  +                     jjCheckNAddTwoStates(224, 225);
                     break;
  -               case 48:
  +               case 22:
                     if ((0x3ff600000000000L & l) != 0L)
                     {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(66);
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(230);
                     }
                     else if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 65;
  +                     jjstateSet[jjnewStateCnt++] = 229;
                     if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(63, 64);
  +                     jjCheckNAddTwoStates(227, 228);
                     else if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 62;
  +                     jjstateSet[jjnewStateCnt++] = 226;
                     if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(60, 61);
  +                     jjCheckNAddTwoStates(224, 225);
  +                  break;
  +               case 0:
  +                  if (curChar == 34)
  +                     jjCheckNAddTwoStates(1, 2);
  +                  break;
  +               case 1:
  +                  if ((0xfffffffbffffffffL & l) != 0L)
  +                     jjCheckNAddTwoStates(1, 2);
  +                  break;
  +               case 2:
  +                  if (curChar != 34)
  +                     break;
  +                  if (kind > 4)
  +                     kind = 4;
  +                  jjstateSet[jjnewStateCnt++] = 0;
  +                  break;
  +               case 3:
  +                  if (curChar == 39)
  +                     jjCheckNAddTwoStates(4, 5);
  +                  break;
  +               case 4:
  +                  if ((0xffffff7fffffffffL & l) != 0L)
  +                     jjCheckNAddTwoStates(4, 5);
  +                  break;
  +               case 5:
  +                  if (curChar != 39)
  +                     break;
  +                  if (kind > 4)
  +                     kind = 4;
  +                  jjstateSet[jjnewStateCnt++] = 3;
  +                  break;
  +               case 7:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(357, 359);
  +                  break;
  +               case 8:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(9, 16);
  +                  break;
  +               case 9:
  +                  jjCheckNAddTwoStates(9, 16);
  +                  break;
  +               case 11:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 8;
  +                  break;
  +               case 15:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 10;
  +                  break;
  +               case 16:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 15;
  +                  break;
  +               case 25:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(360, 362);
                     break;
                  case 26:
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                  {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(66);
  -                  }
  -                  else if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 65;
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(63, 64);
  -                  else if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 62;
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(60, 61);
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(27, 34);
  +                  break;
  +               case 27:
  +                  jjCheckNAddTwoStates(27, 34);
  +                  break;
  +               case 29:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 26;
                     break;
  -               case 1:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(0, 1);
  +               case 33:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 28;
                     break;
  -               case 12:
  +               case 34:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 33;
  +                  break;
  +               case 43:
                     if ((0x100002600L & l) != 0L)
  -                     jjAddStates(73, 74);
  +                     jjAddStates(363, 365);
                     break;
  -               case 18:
  +               case 44:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(45, 54);
  +                  break;
  +               case 45:
  +                  jjCheckNAddTwoStates(45, 54);
  +                  break;
  +               case 47:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 44;
  +                  break;
  +               case 53:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 46;
  +                  break;
  +               case 54:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 53;
  +                  break;
  +               case 56:
                     if (curChar == 42)
  -                     jjstateSet[jjnewStateCnt++] = 19;
  +                     jjstateSet[jjnewStateCnt++] = 57;
                     break;
  -               case 19:
  +               case 57:
                     if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 20;
  +                     jjstateSet[jjnewStateCnt++] = 58;
                     break;
  -               case 21:
  +               case 59:
                     if ((0x3ff600000000000L & l) == 0L)
                        break;
  -                  if (kind > 54)
  -                     kind = 54;
  -                  jjstateSet[jjnewStateCnt++] = 21;
  +                  if (kind > 59)
  +                     kind = 59;
  +                  jjstateSet[jjnewStateCnt++] = 59;
                     break;
  -               case 23:
  +               case 61:
                     if ((0x100002600L & l) != 0L)
  -                     jjAddStates(75, 76);
  +                     jjAddStates(366, 368);
                     break;
  -               case 24:
  -                  if (curChar == 36 && kind > 84)
  -                     kind = 84;
  +               case 62:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(63, 69);
                     break;
  -               case 29:
  +               case 63:
  +                  jjCheckNAddTwoStates(63, 69);
  +                  break;
  +               case 65:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 62;
  +                  break;
  +               case 67:
  +                  if (curChar == 36 && kind > 89)
  +                     kind = 89;
  +                  break;
  +               case 68:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 64;
  +                  break;
  +               case 69:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 68;
  +                  break;
  +               case 74:
                     if ((0x100002600L & l) != 0L)
  -                     jjAddStates(6, 7);
  +                     jjAddStates(369, 371);
                     break;
  -               case 30:
  -                  if (curChar == 36 && kind > 85)
  -                     kind = 85;
  +               case 75:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(76, 82);
                     break;
  -               case 36:
  +               case 76:
  +                  jjCheckNAddTwoStates(76, 82);
  +                  break;
  +               case 78:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 75;
  +                  break;
  +               case 80:
  +                  if (curChar == 36 && kind > 90)
  +                     kind = 90;
  +                  break;
  +               case 81:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 77;
  +                  break;
  +               case 82:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 81;
  +                  break;
  +               case 88:
                     if ((0x100002600L & l) != 0L)
  -                     jjAddStates(77, 78);
  +                     jjAddStates(372, 374);
                     break;
  -               case 37:
  -                  if (curChar == 36 && kind > 86)
  -                     kind = 86;
  +               case 89:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(90, 96);
                     break;
  -               case 41:
  +               case 90:
  +                  jjCheckNAddTwoStates(90, 96);
  +                  break;
  +               case 92:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 89;
  +                  break;
  +               case 94:
  +                  if (curChar == 36 && kind > 91)
  +                     kind = 91;
  +                  break;
  +               case 95:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 91;
  +                  break;
  +               case 96:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 95;
  +                  break;
  +               case 100:
                     if ((0x100002600L & l) != 0L)
  -                     jjAddStates(79, 80);
  +                     jjAddStates(375, 377);
                     break;
  -               case 50:
  -                  if (curChar == 34)
  -                     jjCheckNAddTwoStates(51, 52);
  +               case 101:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(102, 108);
                     break;
  -               case 51:
  -                  if ((0xfffffffbffffffffL & l) != 0L)
  -                     jjCheckNAddTwoStates(51, 52);
  +               case 102:
  +                  jjCheckNAddTwoStates(102, 108);
                     break;
  -               case 52:
  -                  if (curChar != 34)
  +               case 104:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 101;
  +                  break;
  +               case 107:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 103;
  +                  break;
  +               case 108:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 107;
  +                  break;
  +               case 116:
  +                  if ((0x3ff000000000000L & l) == 0L)
                        break;
  -                  if (kind > 106)
  -                     kind = 106;
  -                  jjstateSet[jjnewStateCnt++] = 50;
  +                  if (kind > 1)
  +                     kind = 1;
  +                  jjCheckNAddStates(348, 353);
                     break;
  -               case 53:
  -                  if (curChar == 39)
  -                     jjCheckNAddTwoStates(54, 55);
  +               case 117:
  +                  if ((0x3ff000000000000L & l) == 0L)
  +                     break;
  +                  if (kind > 1)
  +                     kind = 1;
  +                  jjCheckNAdd(117);
                     break;
  -               case 54:
  -                  if ((0xffffff7fffffffffL & l) != 0L)
  -                     jjCheckNAddTwoStates(54, 55);
  +               case 118:
  +                  if ((0x3ff000000000000L & l) != 0L)
  +                     jjCheckNAddTwoStates(118, 119);
                     break;
  -               case 55:
  -                  if (curChar != 39)
  +               case 119:
  +                  if (curChar != 46)
                        break;
  -                  if (kind > 106)
  -                     kind = 106;
  -                  jjstateSet[jjnewStateCnt++] = 53;
  +                  if (kind > 2)
  +                     kind = 2;
  +                  jjCheckNAdd(120);
                     break;
  -               case 56:
  -                  if ((0x100002600L & l) == 0L)
  +               case 120:
  +                  if ((0x3ff000000000000L & l) == 0L)
                        break;
                     if (kind > 2)
                        kind = 2;
  -                  jjCheckNAddTwoStates(57, 58);
  +                  jjCheckNAdd(120);
                     break;
  -               case 57:
  -                  if ((0x100002600L & l) == 0L)
  +               case 121:
  +                  if ((0x3ff000000000000L & l) != 0L)
  +                     jjCheckNAddStates(378, 380);
  +                  break;
  +               case 122:
  +                  if (curChar == 46)
  +                     jjCheckNAddTwoStates(123, 124);
  +                  break;
  +               case 123:
  +                  if ((0x3ff000000000000L & l) != 0L)
  +                     jjCheckNAddTwoStates(123, 124);
  +                  break;
  +               case 125:
  +                  if ((0x280000000000L & l) != 0L)
  +                     jjCheckNAdd(126);
  +                  break;
  +               case 126:
  +                  if ((0x3ff000000000000L & l) == 0L)
  +                     break;
  +                  if (kind > 3)
  +                     kind = 3;
  +                  jjCheckNAdd(126);
  +                  break;
  +               case 127:
  +                  if (curChar == 46)
  +                     jjCheckNAddTwoStates(128, 129);
  +                  break;
  +               case 128:
  +                  if ((0x3ff000000000000L & l) == 0L)
                        break;
                     if (kind > 2)
                        kind = 2;
  -                  jjCheckNAdd(57);
  +                  jjCheckNAdd(128);
  +                  break;
  +               case 129:
  +                  if ((0x3ff000000000000L & l) != 0L)
  +                     jjCheckNAddTwoStates(129, 124);
  +                  break;
  +               case 131:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(132, 135);
  +                  break;
  +               case 132:
  +                  jjCheckNAddTwoStates(132, 135);
  +                  break;
  +               case 134:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 133;
  +                  break;
  +               case 135:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 134;
  +                  break;
  +               case 137:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(138, 144);
  +                  break;
  +               case 138:
  +                  jjCheckNAddTwoStates(138, 144);
  +                  break;
  +               case 140:
  +                  if ((0x100002600L & l) == 0L)
  +                     break;
  +                  if (kind > 6)
  +                     kind = 6;
  +                  jjCheckNAddTwoStates(140, 142);
  +                  break;
  +               case 141:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 137;
  +                  break;
  +               case 143:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 139;
  +                  break;
  +               case 144:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 143;
  +                  break;
  +               case 145:
  +                  if ((0x100002600L & l) == 0L)
  +                     break;
  +                  if (kind > 6)
  +                     kind = 6;
  +                  jjCheckNAddStates(354, 356);
  +                  break;
  +               case 146:
  +                  if ((0x100002600L & l) == 0L)
  +                     break;
  +                  if (kind > 8)
  +                     kind = 8;
  +                  jjCheckNAdd(146);
  +                  break;
  +               case 149:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(381, 383);
  +                  break;
  +               case 150:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(151, 174);
  +                  break;
  +               case 151:
  +                  jjCheckNAddTwoStates(151, 174);
  +                  break;
  +               case 153:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 150;
  +                  break;
  +               case 156:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(384, 386);
  +                  break;
  +               case 157:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(158, 164);
  +                  break;
  +               case 158:
  +                  jjCheckNAddTwoStates(158, 164);
  +                  break;
  +               case 160:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 157;
  +                  break;
  +               case 162:
  +                  if (curChar == 61 && kind > 47)
  +                     kind = 47;
  +                  break;
  +               case 163:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 159;
  +                  break;
  +               case 164:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 163;
                     break;
  -               case 58:
  -                  if ((0x100002600L & l) == 0L)
  -                     break;
  -                  if (kind > 4)
  -                     kind = 4;
  -                  jjCheckNAdd(58);
  +               case 173:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 152;
                     break;
  -               case 60:
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(60, 61);
  +               case 174:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 173;
                     break;
  -               case 61:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 62;
  +               case 181:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(387, 389);
                     break;
  -               case 62:
  -                  if (curChar == 42 && kind > 53)
  -                     kind = 53;
  +               case 182:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(183, 195);
                     break;
  -               case 63:
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(63, 64);
  +               case 183:
  +                  jjCheckNAddTwoStates(183, 195);
                     break;
  -               case 64:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 65;
  +               case 185:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 182;
                     break;
  -               case 66:
  -                  if ((0x3ff600000000000L & l) == 0L)
  -                     break;
  -                  if (kind > 115)
  -                     kind = 115;
  -                  jjCheckNAdd(66);
  +               case 194:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 184;
                     break;
  -               case 67:
  -                  if ((0x3ff000000000000L & l) == 0L)
  -                     break;
  -                  if (kind > 91)
  -                     kind = 91;
  -                  jjCheckNAddStates(67, 72);
  +               case 195:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 194;
                     break;
  -               case 68:
  -                  if ((0x3ff000000000000L & l) == 0L)
  -                     break;
  -                  if (kind > 91)
  -                     kind = 91;
  -                  jjCheckNAdd(68);
  +               case 202:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(390, 392);
                     break;
  -               case 69:
  -                  if ((0x3ff000000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(69, 70);
  +               case 203:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(204, 217);
                     break;
  -               case 70:
  -                  if (curChar != 46)
  -                     break;
  -                  if (kind > 92)
  -                     kind = 92;
  -                  jjCheckNAdd(71);
  +               case 204:
  +                  jjCheckNAddTwoStates(204, 217);
                     break;
  -               case 71:
  -                  if ((0x3ff000000000000L & l) == 0L)
  -                     break;
  -                  if (kind > 92)
  -                     kind = 92;
  -                  jjCheckNAdd(71);
  +               case 206:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 203;
                     break;
  -               case 72:
  -                  if ((0x3ff000000000000L & l) != 0L)
  -                     jjCheckNAddStates(81, 83);
  +               case 216:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 205;
                     break;
  -               case 73:
  -                  if (curChar == 46)
  -                     jjCheckNAddTwoStates(74, 75);
  +               case 217:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 216;
                     break;
  -               case 74:
  -                  if ((0x3ff000000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(74, 75);
  +               case 224:
  +                  if ((0x3ff600000000000L & l) != 0L)
  +                     jjCheckNAddTwoStates(224, 225);
                     break;
  -               case 76:
  -                  if ((0x280000000000L & l) != 0L)
  -                     jjCheckNAdd(77);
  +               case 225:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 226;
                     break;
  -               case 77:
  -                  if ((0x3ff000000000000L & l) == 0L)
  -                     break;
  -                  if (kind > 93)
  -                     kind = 93;
  -                  jjCheckNAdd(77);
  +               case 226:
  +                  if (curChar == 42 && kind > 58)
  +                     kind = 58;
                     break;
  -               case 78:
  -                  if (curChar == 46)
  -                     jjCheckNAddTwoStates(79, 80);
  +               case 227:
  +                  if ((0x3ff600000000000L & l) != 0L)
  +                     jjCheckNAddTwoStates(227, 228);
                     break;
  -               case 79:
  -                  if ((0x3ff000000000000L & l) == 0L)
  -                     break;
  -                  if (kind > 92)
  -                     kind = 92;
  -                  jjCheckNAdd(79);
  +               case 228:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 229;
                     break;
  -               case 80:
  -                  if ((0x3ff000000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(80, 75);
  +               case 230:
  +                  if ((0x3ff600000000000L & l) == 0L)
  +                     break;
  +                  if (kind > 116)
  +                     kind = 116;
  +                  jjCheckNAdd(230);
                     break;
                  default : break;
               }
  @@ -3744,1168 +7111,680 @@
            {
               switch(jjstateSet[--i])
               {
  -               case 38:
  +               case 179:
                     if ((0x7fffffe87fffffeL & l) != 0L)
                     {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(66);
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(230);
                     }
                     if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(63, 64);
  +                     jjCheckNAddTwoStates(227, 228);
                     if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(60, 61);
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 35;
  +                     jjCheckNAddTwoStates(224, 225);
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 221;
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 199;
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 178;
                     break;
  -               case 9:
  +               case 23:
                     if ((0x7fffffe87fffffeL & l) != 0L)
                     {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(66);
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAddStates(393, 397);
                     }
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(63, 64);
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(60, 61);
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 8;
  +                  else if (curChar == 123)
  +                     jjCheckNAddTwoStates(136, 141);
  +                  if (curChar == 100)
  +                     jjAddStates(398, 400);
  +                  else if (curChar == 118)
  +                     jjstateSet[jjnewStateCnt++] = 114;
  +                  else if (curChar == 102)
  +                     jjstateSet[jjnewStateCnt++] = 97;
  +                  else if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 85;
  +                  else if (curChar == 115)
  +                     jjstateSet[jjnewStateCnt++] = 71;
  +                  else if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 42;
  +                  else if (curChar == 99)
  +                     jjstateSet[jjnewStateCnt++] = 40;
  +                  else if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 22;
                     break;
  -               case 11:
  +               case 231:
                     if ((0x7fffffe87fffffeL & l) != 0L)
                     {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(66);
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(230);
                     }
                     if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(63, 64);
  +                     jjCheckNAddTwoStates(227, 228);
                     if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(60, 61);
  -                  if (curChar == 102)
  -                     jjstateSet[jjnewStateCnt++] = 12;
  +                     jjCheckNAddTwoStates(224, 225);
                     break;
  -               case 33:
  +               case 21:
                     if ((0x7fffffe87fffffeL & l) != 0L)
                     {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(66);
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(230);
                     }
                     if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(63, 64);
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(60, 61);
  -                  if (curChar == 118)
  -                     jjstateSet[jjnewStateCnt++] = 32;
  -                  break;
  -               case 10:
  +                     jjCheckNAddTwoStates(227, 228);
                     if ((0x7fffffe87fffffeL & l) != 0L)
  -                  {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAddStates(84, 88);
  -                  }
  -                  if (curChar == 100)
  -                     jjstateSet[jjnewStateCnt++] = 48;
  -                  else if (curChar == 102)
  -                     jjstateSet[jjnewStateCnt++] = 38;
  -                  else if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 33;
  -                  else if (curChar == 115)
  -                     jjstateSet[jjnewStateCnt++] = 26;
  -                  else if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 11;
  -                  else if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 9;
  +                     jjCheckNAddTwoStates(224, 225);
  +                  if (curChar == 115)
  +                     jjstateSet[jjnewStateCnt++] = 20;
                     break;
  -               case 35:
  +               case 71:
                     if ((0x7fffffe87fffffeL & l) != 0L)
                     {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(66);
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(230);
                     }
                     if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(63, 64);
  +                     jjCheckNAddTwoStates(227, 228);
                     if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(60, 61);
  -                  if (curChar == 114)
  -                     jjAddStates(77, 78);
  +                     jjCheckNAddTwoStates(224, 225);
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 70;
                     break;
  -               case 82:
  +               case 85:
                     if ((0x7fffffe87fffffeL & l) != 0L)
                     {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(66);
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(230);
                     }
                     if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(63, 64);
  +                     jjCheckNAddTwoStates(227, 228);
                     if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(60, 61);
  +                     jjCheckNAddTwoStates(224, 225);
  +                  if (curChar == 118)
  +                     jjstateSet[jjnewStateCnt++] = 84;
                     break;
  -               case 8:
  +               case 42:
                     if ((0x7fffffe87fffffeL & l) != 0L)
                     {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(66);
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(230);
                     }
                     if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(63, 64);
  +                     jjCheckNAddTwoStates(227, 228);
                     if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(60, 61);
  -                  if (curChar == 115)
  -                     jjstateSet[jjnewStateCnt++] = 7;
  +                     jjCheckNAddTwoStates(224, 225);
  +                  if (curChar == 102)
  +                     jjCheckNAddTwoStates(43, 48);
                     break;
  -               case 48:
  +               case 40:
                     if ((0x7fffffe87fffffeL & l) != 0L)
                     {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(66);
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(230);
                     }
                     if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(63, 64);
  +                     jjCheckNAddTwoStates(227, 228);
                     if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(60, 61);
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 47;
  +                     jjCheckNAddTwoStates(224, 225);
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 39;
                     break;
  -               case 26:
  +               case 22:
                     if ((0x7fffffe87fffffeL & l) != 0L)
                     {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(66);
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(230);
                     }
                     if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(63, 64);
  +                     jjCheckNAddTwoStates(227, 228);
                     if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(60, 61);
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 25;
  -                  break;
  -               case 0:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 1;
  -                  break;
  -               case 2:
  -                  if (curChar == 102 && kind > 35)
  -                     kind = 35;
  +                     jjCheckNAddTwoStates(224, 225);
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 21;
                     break;
  -               case 3:
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 2;
  +               case 1:
  +                  jjAddStates(243, 244);
                     break;
                  case 4:
  -                  if (curChar == 99)
  -                     jjstateSet[jjnewStateCnt++] = 0;
  -                  break;
  -               case 5:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 4;
  +                  jjAddStates(245, 246);
                     break;
                  case 6:
  -                  if (curChar == 97)
  -                     jjstateSet[jjnewStateCnt++] = 5;
  +                  if (curChar == 101)
  +                     jjCheckNAddTwoStates(7, 12);
                     break;
  -               case 7:
  -                  if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 6;
  +               case 9:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(401, 402);
  +                  break;
  +               case 10:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(357, 359);
  +                  break;
  +               case 12:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 11;
                     break;
                  case 13:
  -                  if (curChar == 101 && kind > 45)
  -                     kind = 45;
  +                  if (curChar == 102 && kind > 38)
  +                     kind = 38;
                     break;
                  case 14:
  -                  if (curChar == 112)
  +                  if (curChar == 111)
                        jjstateSet[jjnewStateCnt++] = 13;
                     break;
  -               case 15:
  -                  if (curChar == 121)
  -                     jjstateSet[jjnewStateCnt++] = 14;
  +               case 17:
  +                  if (curChar == 99)
  +                     jjstateSet[jjnewStateCnt++] = 6;
                     break;
  -               case 16:
  -                  if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 15;
  +               case 18:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 17;
                     break;
  -               case 17:
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 11;
  +               case 19:
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 18;
                     break;
                  case 20:
  -               case 21:
  -                  if ((0x7fffffe87fffffeL & l) == 0L)
  -                     break;
  -                  if (kind > 54)
  -                     kind = 54;
  -                  jjCheckNAdd(21);
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 19;
                     break;
  -               case 22:
  +               case 24:
                     if (curChar == 101)
  -                     jjAddStates(75, 76);
  -                  break;
  -               case 25:
  -                  if (curChar == 109)
  -                     jjstateSet[jjnewStateCnt++] = 22;
  +                     jjCheckNAddTwoStates(25, 30);
                     break;
                  case 27:
  -                  if (curChar == 115)
  -                     jjstateSet[jjnewStateCnt++] = 26;
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(403, 404);
                     break;
                  case 28:
  -                  if (curChar == 121)
  -                     jjAddStates(6, 7);
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(360, 362);
  +                  break;
  +               case 30:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 29;
                     break;
                  case 31:
  -                  if (curChar == 114)
  -                     jjstateSet[jjnewStateCnt++] = 28;
  +                  if (curChar == 115 && kind > 39)
  +                     kind = 39;
                     break;
                  case 32:
  -                  if (curChar == 101)
  +                  if (curChar == 97)
                        jjstateSet[jjnewStateCnt++] = 31;
                     break;
  -               case 34:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 33;
  +               case 35:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 24;
                     break;
  -               case 39:
  -                  if (curChar == 102)
  -                     jjstateSet[jjnewStateCnt++] = 38;
  +               case 36:
  +                  if (curChar == 98)
  +                     jjstateSet[jjnewStateCnt++] = 35;
                     break;
  -               case 40:
  +               case 37:
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 36;
  +                  break;
  +               case 38:
                     if (curChar == 116)
  -                     jjAddStates(79, 80);
  +                     jjstateSet[jjnewStateCnt++] = 37;
                     break;
  -               case 42:
  -                  if (curChar == 123 && kind > 96)
  -                     kind = 96;
  +               case 39:
  +                  if (curChar == 115)
  +                     jjstateSet[jjnewStateCnt++] = 38;
                     break;
  -               case 43:
  -                  if (curChar == 110)
  +               case 41:
  +                  if (curChar == 99)
                        jjstateSet[jjnewStateCnt++] = 40;
                     break;
  -               case 44:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 43;
  -                  break;
                  case 45:
  -                  if (curChar == 109)
  -                     jjstateSet[jjnewStateCnt++] = 44;
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(405, 406);
                     break;
                  case 46:
  -                  if (curChar == 117)
  -                     jjstateSet[jjnewStateCnt++] = 45;
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(363, 365);
                     break;
  -               case 47:
  -                  if (curChar == 99)
  -                     jjstateSet[jjnewStateCnt++] = 46;
  +               case 48:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 47;
                     break;
                  case 49:
  -                  if (curChar == 100)
  -                     jjstateSet[jjnewStateCnt++] = 48;
  +                  if (curChar == 101 && kind > 50)
  +                     kind = 50;
  +                  break;
  +               case 50:
  +                  if (curChar == 112)
  +                     jjstateSet[jjnewStateCnt++] = 49;
                     break;
                  case 51:
  -                  jjAddStates(89, 90);
  +                  if (curChar == 121)
  +                     jjstateSet[jjnewStateCnt++] = 50;
                     break;
  -               case 54:
  -                  jjAddStates(91, 92);
  +               case 52:
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 51;
  +                  break;
  +               case 55:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 42;
                     break;
  +               case 58:
                  case 59:
                     if ((0x7fffffe87fffffeL & l) == 0L)
                        break;
  -                  if (kind > 115)
  -                     kind = 115;
  -                  jjCheckNAddStates(84, 88);
  +                  if (kind > 59)
  +                     kind = 59;
  +                  jjCheckNAdd(59);
                     break;
                  case 60:
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(60, 61);
  +                  if (curChar == 101)
  +                     jjCheckNAddStates(366, 368);
                     break;
                  case 63:
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(63, 64);
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(407, 408);
                     break;
  -               case 65:
  -                  if ((0x7fffffe87fffffeL & l) == 0L)
  -                     break;
  -                  if (kind > 115)
  -                     kind = 115;
  -                  jjCheckNAdd(66);
  +               case 64:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(366, 368);
                     break;
                  case 66:
  -                  if ((0x7fffffe87fffffeL & l) == 0L)
  -                     break;
  -                  if (kind > 115)
  -                     kind = 115;
  -                  jjCheckNAdd(66);
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 65;
                     break;
  -               case 75:
  -                  if ((0x2000000020L & l) != 0L)
  -                     jjAddStates(93, 94);
  +               case 70:
  +                  if (curChar == 109)
  +                     jjstateSet[jjnewStateCnt++] = 60;
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      else
  -      {
  -         int i2 = (curChar & 0xff) >> 6;
  -         long l2 = 1L << (curChar & 077);
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 38:
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(60, 61);
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(63, 64);
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                  {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(66);
  -                  }
  +               case 72:
  +                  if (curChar == 115)
  +                     jjstateSet[jjnewStateCnt++] = 71;
                     break;
  -               case 9:
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(60, 61);
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(63, 64);
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                  {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(66);
  -                  }
  +               case 73:
  +                  if (curChar == 121)
  +                     jjCheckNAddStates(369, 371);
                     break;
  -               case 11:
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(60, 61);
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(63, 64);
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                  {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(66);
  -                  }
  +               case 76:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(409, 410);
                     break;
  -               case 33:
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(60, 61);
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(63, 64);
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                  {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(66);
  -                  }
  +               case 77:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(369, 371);
                     break;
  -               case 10:
  -                  if ((jjbitVec5[i2] & l2) == 0L)
  -                     break;
  -                  if (kind > 115)
  -                     kind = 115;
  -                  jjCheckNAddStates(84, 88);
  +               case 79:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 78;
                     break;
  -               case 35:
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(60, 61);
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(63, 64);
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                  {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(66);
  -                  }
  +               case 83:
  +                  if (curChar == 114)
  +                     jjstateSet[jjnewStateCnt++] = 73;
                     break;
  -               case 82:
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(60, 61);
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(63, 64);
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                  {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(66);
  -                  }
  +               case 84:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 83;
                     break;
  -               case 8:
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(60, 61);
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(63, 64);
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                  {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(66);
  -                  }
  +               case 86:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 85;
                     break;
  -               case 48:
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(60, 61);
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(63, 64);
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                  {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(66);
  -                  }
  +               case 87:
  +                  if (curChar == 114)
  +                     jjCheckNAddStates(372, 374);
                     break;
  -               case 26:
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(60, 61);
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(63, 64);
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                  {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(66);
  -                  }
  +               case 90:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(411, 412);
  +                  break;
  +               case 91:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(372, 374);
  +                  break;
  +               case 93:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 92;
  +                  break;
  +               case 97:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 87;
  +                  break;
  +               case 98:
  +                  if (curChar == 102)
  +                     jjstateSet[jjnewStateCnt++] = 97;
  +                  break;
  +               case 99:
  +                  if (curChar == 101)
  +                     jjCheckNAddStates(375, 377);
  +                  break;
  +               case 102:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(413, 414);
  +                  break;
  +               case 103:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(375, 377);
  +                  break;
  +               case 105:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 104;
  +                  break;
  +               case 106:
  +                  if (curChar == 123 && kind > 94)
  +                     kind = 94;
  +                  break;
  +               case 109:
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 99;
  +                  break;
  +               case 110:
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 109;
                     break;
  -               case 20:
  -                  if ((jjbitVec5[i2] & l2) == 0L)
  -                     break;
  -                  if (kind > 54)
  -                     kind = 54;
  -                  jjCheckNAdd(21);
  +               case 111:
  +                  if (curChar == 100)
  +                     jjstateSet[jjnewStateCnt++] = 110;
                     break;
  -               case 21:
  -                  if ((jjbitVec28[i2] & l2) == 0L)
  -                     break;
  -                  if (kind > 54)
  -                     kind = 54;
  -                  jjCheckNAdd(21);
  +               case 112:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 111;
                     break;
  -               case 51:
  -                  if ((jjbitVec2[i2] & l2) != 0L)
  -                     jjAddStates(89, 90);
  +               case 113:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 112;
                     break;
  -               case 54:
  -                  if ((jjbitVec2[i2] & l2) != 0L)
  -                     jjAddStates(91, 92);
  +               case 114:
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 113;
                     break;
  -               case 60:
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(60, 61);
  +               case 115:
  +                  if (curChar == 118)
  +                     jjstateSet[jjnewStateCnt++] = 114;
                     break;
  -               case 63:
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(63, 64);
  +               case 124:
  +                  if ((0x2000000020L & l) != 0L)
  +                     jjAddStates(415, 416);
                     break;
  -               case 65:
  -                  if ((jjbitVec5[i2] & l2) == 0L)
  -                     break;
  -                  if (kind > 115)
  -                     kind = 115;
  -                  jjCheckNAdd(66);
  +               case 130:
  +                  if (curChar == 123)
  +                     jjCheckNAddTwoStates(136, 141);
                     break;
  -               case 66:
  -                  if ((jjbitVec28[i2] & l2) == 0L)
  -                     break;
  -                  if (kind > 115)
  -                     kind = 115;
  -                  jjCheckNAdd(66);
  +               case 132:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(417, 418);
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      if (kind != 0x7fffffff)
  -      {
  -         jjmatchedKind = kind;
  -         jjmatchedPos = curPos;
  -         kind = 0x7fffffff;
  -      }
  -      ++curPos;
  -      if ((i = jjnewStateCnt) == (startsAt = 81 - (jjnewStateCnt = 
startsAt)))
  -         return curPos;
  -      try { curChar = input_stream.readChar(); }
  -      catch(java.io.IOException e) { return curPos; }
  -   }
  -}
  -private final int jjMoveStringLiteralDfa0_14()
  -{
  -   return jjMoveNfa_14(0, 0);
  -}
  -private final int jjMoveNfa_14(int startState, int curPos)
  -{
  -   int[] nextStates;
  -   int startsAt = 0;
  -   jjnewStateCnt = 1;
  -   int i = 1;
  -   jjstateSet[0] = startState;
  -   int j, kind = 0x7fffffff;
  -   for (;;)
  -   {
  -      if (++jjround == 0x7fffffff)
  -         ReInitRounds();
  -      if (curChar < 64)
  -      {
  -         long l = 1L << curChar;
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 0:
  -                  if ((0xffffffff00002600L & l) != 0L)
  -                     kind = 121;
  +               case 133:
  +                  if (curChar == 125 && kind > 5)
  +                     kind = 5;
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      else if (curChar < 128)
  -      {
  -         long l = 1L << (curChar & 077);
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 0:
  -                  kind = 121;
  +               case 138:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(419, 420);
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      else
  -      {
  -         int i2 = (curChar & 0xff) >> 6;
  -         long l2 = 1L << (curChar & 077);
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 0:
  -                  if ((jjbitVec2[i2] & l2) != 0L && kind > 121)
  -                     kind = 121;
  +               case 139:
  +                  if (curChar != 125)
  +                     break;
  +                  if (kind > 6)
  +                     kind = 6;
  +                  jjAddStates(421, 422);
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      if (kind != 0x7fffffff)
  -      {
  -         jjmatchedKind = kind;
  -         jjmatchedPos = curPos;
  -         kind = 0x7fffffff;
  -      }
  -      ++curPos;
  -      if ((i = jjnewStateCnt) == (startsAt = 1 - (jjnewStateCnt = startsAt)))
  -         return curPos;
  -      try { curChar = input_stream.readChar(); }
  -      catch(java.io.IOException e) { return curPos; }
  -   }
  -}
  -private final int jjMoveStringLiteralDfa0_8()
  -{
  -   return jjMoveNfa_8(6, 0);
  -}
  -private final int jjMoveNfa_8(int startState, int curPos)
  -{
  -   int[] nextStates;
  -   int startsAt = 0;
  -   jjnewStateCnt = 9;
  -   int i = 1;
  -   jjstateSet[0] = startState;
  -   int j, kind = 0x7fffffff;
  -   for (;;)
  -   {
  -      if (++jjround == 0x7fffffff)
  -         ReInitRounds();
  -      if (curChar < 64)
  -      {
  -         long l = 1L << curChar;
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 6:
  -                  if ((0x100002600L & l) != 0L)
  -                  {
  -                     if (kind > 2)
  -                        kind = 2;
  -                     jjCheckNAddTwoStates(7, 8);
  -                  }
  -                  else if (curChar == 39)
  -                     jjCheckNAddTwoStates(4, 5);
  -                  else if (curChar == 34)
  -                     jjCheckNAddTwoStates(1, 2);
  +               case 142:
  +                  if (curChar == 123)
  +                     jjCheckNAdd(141);
                     break;
  -               case 0:
  -                  if (curChar == 34)
  -                     jjCheckNAddTwoStates(1, 2);
  +               case 147:
  +                  if (curChar == 100)
  +                     jjAddStates(398, 400);
                     break;
  -               case 1:
  -                  if ((0xfffffffbffffffffL & l) != 0L)
  -                     jjCheckNAddTwoStates(1, 2);
  +               case 148:
  +                  if (curChar == 116)
  +                     jjCheckNAddTwoStates(149, 154);
                     break;
  -               case 2:
  -                  if (curChar != 34)
  -                     break;
  -                  if (kind > 106)
  -                     kind = 106;
  -                  jjstateSet[jjnewStateCnt++] = 0;
  +               case 151:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(423, 424);
                     break;
  -               case 3:
  -                  if (curChar == 39)
  -                     jjCheckNAddTwoStates(4, 5);
  +               case 152:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(381, 383);
                     break;
  -               case 4:
  -                  if ((0xffffff7fffffffffL & l) != 0L)
  -                     jjCheckNAddTwoStates(4, 5);
  +               case 154:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 153;
                     break;
  -               case 5:
  -                  if (curChar != 39)
  -                     break;
  -                  if (kind > 106)
  -                     kind = 106;
  -                  jjstateSet[jjnewStateCnt++] = 3;
  +               case 155:
  +                  if (curChar == 110)
  +                     jjCheckNAddTwoStates(156, 161);
                     break;
  -               case 7:
  -                  if ((0x100002600L & l) == 0L)
  -                     break;
  -                  if (kind > 2)
  -                     kind = 2;
  -                  jjCheckNAdd(7);
  +               case 158:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(425, 426);
                     break;
  -               case 8:
  -                  if ((0x100002600L & l) == 0L)
  -                     break;
  -                  if (kind > 4)
  -                     kind = 4;
  -                  jjCheckNAdd(8);
  +               case 159:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(384, 386);
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      else if (curChar < 128)
  -      {
  -         long l = 1L << (curChar & 077);
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 1:
  -                  jjAddStates(95, 96);
  +               case 161:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 160;
                     break;
  -               case 4:
  -                  jjAddStates(97, 98);
  +               case 165:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 155;
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      else
  -      {
  -         int i2 = (curChar & 0xff) >> 6;
  -         long l2 = 1L << (curChar & 077);
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 1:
  -                  if ((jjbitVec2[i2] & l2) != 0L)
  -                     jjAddStates(95, 96);
  +               case 166:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 165;
  +                  break;
  +               case 167:
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 166;
                     break;
  -               case 4:
  -                  if ((jjbitVec2[i2] & l2) != 0L)
  -                     jjAddStates(97, 98);
  +               case 168:
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 167;
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      if (kind != 0x7fffffff)
  -      {
  -         jjmatchedKind = kind;
  -         jjmatchedPos = curPos;
  -         kind = 0x7fffffff;
  -      }
  -      ++curPos;
  -      if ((i = jjnewStateCnt) == (startsAt = 9 - (jjnewStateCnt = startsAt)))
  -         return curPos;
  -      try { curChar = input_stream.readChar(); }
  -      catch(java.io.IOException e) { return curPos; }
  -   }
  -}
  -private final int jjMoveStringLiteralDfa0_11()
  -{
  -   return jjMoveNfa_11(0, 0);
  -}
  -private final int jjMoveNfa_11(int startState, int curPos)
  -{
  -   int[] nextStates;
  -   int startsAt = 0;
  -   jjnewStateCnt = 5;
  -   int i = 1;
  -   jjstateSet[0] = startState;
  -   int j, kind = 0x7fffffff;
  -   for (;;)
  -   {
  -      if (++jjround == 0x7fffffff)
  -         ReInitRounds();
  -      if (curChar < 64)
  -      {
  -         long l = 1L << curChar;
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 1:
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                     jjAddStates(95, 96);
  +               case 169:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 168;
                     break;
  -               case 2:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 3;
  +               case 170:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 169;
                     break;
  -               case 4:
  -                  if ((0x3ff600000000000L & l) == 0L)
  -                     break;
  -                  if (kind > 114)
  -                     kind = 114;
  -                  jjstateSet[jjnewStateCnt++] = 4;
  +               case 171:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 170;
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      else if (curChar < 128)
  -      {
  -         long l = 1L << (curChar & 077);
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 0:
  -                  if ((0x7fffffe87fffffeL & l) == 0L)
  -                     break;
  -                  if (kind > 114)
  -                     kind = 114;
  -                  jjCheckNAddStates(99, 101);
  +               case 172:
  +                  if (curChar == 99)
  +                     jjstateSet[jjnewStateCnt++] = 171;
                     break;
  -               case 1:
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(1, 2);
  +               case 175:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 148;
                     break;
  -               case 3:
  -               case 4:
  -                  if ((0x7fffffe87fffffeL & l) == 0L)
  -                     break;
  -                  if (kind > 114)
  -                     kind = 114;
  -                  jjCheckNAdd(4);
  +               case 176:
  +                  if (curChar == 117)
  +                     jjstateSet[jjnewStateCnt++] = 175;
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      else
  -      {
  -         int i2 = (curChar & 0xff) >> 6;
  -         long l2 = 1L << (curChar & 077);
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 0:
  -                  if ((jjbitVec5[i2] & l2) == 0L)
  -                     break;
  -                  if (kind > 114)
  -                     kind = 114;
  -                  jjCheckNAddStates(99, 101);
  +               case 177:
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 176;
                     break;
  -               case 1:
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(1, 2);
  +               case 178:
  +                  if (curChar == 102)
  +                     jjstateSet[jjnewStateCnt++] = 177;
                     break;
  -               case 3:
  -                  if ((jjbitVec5[i2] & l2) == 0L)
  -                     break;
  -                  if (kind > 114)
  -                     kind = 114;
  -                  jjCheckNAdd(4);
  +               case 180:
  +                  if (curChar == 116)
  +                     jjCheckNAddTwoStates(181, 186);
                     break;
  -               case 4:
  -                  if ((jjbitVec28[i2] & l2) == 0L)
  -                     break;
  -                  if (kind > 114)
  -                     kind = 114;
  -                  jjCheckNAdd(4);
  +               case 183:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(427, 428);
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      if (kind != 0x7fffffff)
  -      {
  -         jjmatchedKind = kind;
  -         jjmatchedPos = curPos;
  -         kind = 0x7fffffff;
  -      }
  -      ++curPos;
  -      if ((i = jjnewStateCnt) == (startsAt = 5 - (jjnewStateCnt = startsAt)))
  -         return curPos;
  -      try { curChar = input_stream.readChar(); }
  -      catch(java.io.IOException e) { return curPos; }
  -   }
  -}
  -private final int jjStopStringLiteralDfa_9(int pos, long active0, long 
active1)
  -{
  -   switch (pos)
  -   {
  -      default :
  -         return -1;
  -   }
  -}
  -private final int jjStartNfa_9(int pos, long active0, long active1)
  -{
  -   return jjMoveNfa_9(jjStopStringLiteralDfa_9(pos, active0, active1), pos + 
1);
  -}
  -private final int jjStartNfaWithStates_9(int pos, int kind, int state)
  -{
  -   jjmatchedKind = kind;
  -   jjmatchedPos = pos;
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) { return pos + 1; }
  -   return jjMoveNfa_9(state, pos + 1);
  -}
  -private final int jjMoveStringLiteralDfa0_9()
  -{
  -   switch(curChar)
  -   {
  -      case 123:
  -         return jjStopAtPos(0, 119);
  -      default :
  -         return jjMoveNfa_9(0, 0);
  -   }
  -}
  -private final int jjMoveNfa_9(int startState, int curPos)
  -{
  -   int[] nextStates;
  -   int startsAt = 0;
  -   jjnewStateCnt = 1;
  -   int i = 1;
  -   jjstateSet[0] = startState;
  -   int j, kind = 0x7fffffff;
  -   for (;;)
  -   {
  -      if (++jjround == 0x7fffffff)
  -         ReInitRounds();
  -      if (curChar < 64)
  -      {
  -         long l = 1L << curChar;
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 0:
  -                  if ((0x100002600L & l) == 0L)
  -                     break;
  -                  kind = 4;
  -                  jjstateSet[jjnewStateCnt++] = 0;
  +               case 184:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(387, 389);
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      else if (curChar < 128)
  -      {
  -         long l = 1L << (curChar & 077);
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      else
  -      {
  -         int i2 = (curChar & 0xff) >> 6;
  -         long l2 = 1L << (curChar & 077);
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      if (kind != 0x7fffffff)
  -      {
  -         jjmatchedKind = kind;
  -         jjmatchedPos = curPos;
  -         kind = 0x7fffffff;
  -      }
  -      ++curPos;
  -      if ((i = jjnewStateCnt) == (startsAt = 1 - (jjnewStateCnt = startsAt)))
  -         return curPos;
  -      try { curChar = input_stream.readChar(); }
  -      catch(java.io.IOException e) { return curPos; }
  -   }
  -}
  -private final int jjMoveStringLiteralDfa0_17()
  -{
  -   return jjMoveNfa_17(0, 0);
  -}
  -private final int jjMoveNfa_17(int startState, int curPos)
  -{
  -   int[] nextStates;
  -   int startsAt = 0;
  -   jjnewStateCnt = 1;
  -   int i = 1;
  -   jjstateSet[0] = startState;
  -   int j, kind = 0x7fffffff;
  -   for (;;)
  -   {
  -      if (++jjround == 0x7fffffff)
  -         ReInitRounds();
  -      if (curChar < 64)
  -      {
  -         long l = 1L << curChar;
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 0:
  -                  if ((0xffffffff00002600L & l) != 0L)
  -                     kind = 121;
  +               case 186:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 185;
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      else if (curChar < 128)
  -      {
  -         long l = 1L << (curChar & 077);
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 0:
  -                  kind = 121;
  +               case 187:
  +                  if (curChar == 116 && kind > 48)
  +                     kind = 48;
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      else
  -      {
  -         int i2 = (curChar & 0xff) >> 6;
  -         long l2 = 1L << (curChar & 077);
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 0:
  -                  if ((jjbitVec2[i2] & l2) != 0L && kind > 121)
  -                     kind = 121;
  +               case 188:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 187;
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      if (kind != 0x7fffffff)
  -      {
  -         jjmatchedKind = kind;
  -         jjmatchedPos = curPos;
  -         kind = 0x7fffffff;
  -      }
  -      ++curPos;
  -      if ((i = jjnewStateCnt) == (startsAt = 1 - (jjnewStateCnt = startsAt)))
  -         return curPos;
  -      try { curChar = input_stream.readChar(); }
  -      catch(java.io.IOException e) { return curPos; }
  -   }
  -}
  -private final int jjMoveStringLiteralDfa0_4()
  -{
  -   return jjMoveNfa_4(6, 0);
  -}
  -private final int jjMoveNfa_4(int startState, int curPos)
  -{
  -   int[] nextStates;
  -   int startsAt = 0;
  -   jjnewStateCnt = 9;
  -   int i = 1;
  -   jjstateSet[0] = startState;
  -   int j, kind = 0x7fffffff;
  -   for (;;)
  -   {
  -      if (++jjround == 0x7fffffff)
  -         ReInitRounds();
  -      if (curChar < 64)
  -      {
  -         long l = 1L << curChar;
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 6:
  -                  if ((0x100002600L & l) != 0L)
  -                  {
  -                     if (kind > 2)
  -                        kind = 2;
  -                     jjCheckNAddTwoStates(7, 8);
  -                  }
  -                  else if (curChar == 39)
  -                     jjCheckNAddTwoStates(4, 5);
  -                  else if (curChar == 34)
  -                     jjCheckNAddTwoStates(1, 2);
  +               case 189:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 188;
                     break;
  -               case 0:
  -                  if (curChar == 34)
  -                     jjCheckNAddTwoStates(1, 2);
  +               case 190:
  +                  if (curChar == 109)
  +                     jjstateSet[jjnewStateCnt++] = 189;
                     break;
  -               case 1:
  -                  if ((0xfffffffbffffffffL & l) != 0L)
  -                     jjCheckNAddTwoStates(1, 2);
  +               case 191:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 190;
                     break;
  -               case 2:
  -                  if (curChar != 34)
  -                     break;
  -                  if (kind > 107)
  -                     kind = 107;
  -                  jjstateSet[jjnewStateCnt++] = 0;
  +               case 192:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 191;
                     break;
  -               case 3:
  -                  if (curChar == 39)
  -                     jjCheckNAddTwoStates(4, 5);
  +               case 193:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 192;
                     break;
  -               case 4:
  -                  if ((0xffffff7fffffffffL & l) != 0L)
  -                     jjCheckNAddTwoStates(4, 5);
  +               case 196:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 180;
                     break;
  -               case 5:
  -                  if (curChar != 39)
  -                     break;
  -                  if (kind > 107)
  -                     kind = 107;
  -                  jjstateSet[jjnewStateCnt++] = 3;
  +               case 197:
  +                  if (curChar == 117)
  +                     jjstateSet[jjnewStateCnt++] = 196;
                     break;
  -               case 7:
  -                  if ((0x100002600L & l) == 0L)
  -                     break;
  -                  if (kind > 2)
  -                     kind = 2;
  -                  jjCheckNAdd(7);
  +               case 198:
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 197;
                     break;
  -               case 8:
  -                  if ((0x100002600L & l) == 0L)
  -                     break;
  -                  if (kind > 4)
  -                     kind = 4;
  -                  jjCheckNAdd(8);
  +               case 199:
  +                  if (curChar == 102)
  +                     jjstateSet[jjnewStateCnt++] = 198;
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      else if (curChar < 128)
  -      {
  -         long l = 1L << (curChar & 077);
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 1:
  -                  jjAddStates(95, 96);
  +               case 200:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 199;
                     break;
  -               case 4:
  -                  jjAddStates(97, 98);
  +               case 201:
  +                  if (curChar == 116)
  +                     jjCheckNAddTwoStates(202, 207);
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      else
  -      {
  -         int i2 = (curChar & 0xff) >> 6;
  -         long l2 = 1L << (curChar & 077);
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 1:
  -                  if ((jjbitVec2[i2] & l2) != 0L)
  -                     jjAddStates(95, 96);
  +               case 204:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(429, 430);
                     break;
  -               case 4:
  -                  if ((jjbitVec2[i2] & l2) != 0L)
  -                     jjAddStates(97, 98);
  +               case 205:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(390, 392);
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      if (kind != 0x7fffffff)
  -      {
  -         jjmatchedKind = kind;
  -         jjmatchedPos = curPos;
  -         kind = 0x7fffffff;
  -      }
  -      ++curPos;
  -      if ((i = jjnewStateCnt) == (startsAt = 9 - (jjnewStateCnt = startsAt)))
  -         return curPos;
  -      try { curChar = input_stream.readChar(); }
  -      catch(java.io.IOException e) { return curPos; }
  -   }
  -}
  -private final int jjMoveStringLiteralDfa0_5()
  -{
  -   return jjMoveNfa_5(0, 0);
  -}
  -private final int jjMoveNfa_5(int startState, int curPos)
  -{
  -   int[] nextStates;
  -   int startsAt = 0;
  -   jjnewStateCnt = 1;
  -   int i = 1;
  -   jjstateSet[0] = startState;
  -   int j, kind = 0x7fffffff;
  -   for (;;)
  -   {
  -      if (++jjround == 0x7fffffff)
  -         ReInitRounds();
  -      if (curChar < 64)
  -      {
  -         long l = 1L << curChar;
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 0:
  -                  if ((0x100002600L & l) == 0L)
  +               case 207:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 206;
  +                  break;
  +               case 208:
  +                  if (curChar == 110 && kind > 49)
  +                     kind = 49;
  +                  break;
  +               case 209:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 208;
  +                  break;
  +               case 210:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 209;
  +                  break;
  +               case 211:
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 210;
  +                  break;
  +               case 212:
  +                  if (curChar == 99)
  +                     jjstateSet[jjnewStateCnt++] = 211;
  +                  break;
  +               case 213:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 212;
  +                  break;
  +               case 214:
  +                  if (curChar == 117)
  +                     jjstateSet[jjnewStateCnt++] = 213;
  +                  break;
  +               case 215:
  +                  if (curChar == 102)
  +                     jjstateSet[jjnewStateCnt++] = 214;
  +                  break;
  +               case 218:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 201;
  +                  break;
  +               case 219:
  +                  if (curChar == 117)
  +                     jjstateSet[jjnewStateCnt++] = 218;
  +                  break;
  +               case 220:
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 219;
  +                  break;
  +               case 221:
  +                  if (curChar == 102)
  +                     jjstateSet[jjnewStateCnt++] = 220;
  +                  break;
  +               case 222:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 221;
  +                  break;
  +               case 223:
  +                  if ((0x7fffffe87fffffeL & l) == 0L)
                        break;
  -                  kind = 2;
  -                  jjstateSet[jjnewStateCnt++] = 0;
  +                  if (kind > 116)
  +                     kind = 116;
  +                  jjCheckNAddStates(393, 397);
  +                  break;
  +               case 224:
  +                  if ((0x7fffffe87fffffeL & l) != 0L)
  +                     jjCheckNAddTwoStates(224, 225);
  +                  break;
  +               case 227:
  +                  if ((0x7fffffe87fffffeL & l) != 0L)
  +                     jjCheckNAddTwoStates(227, 228);
  +                  break;
  +               case 229:
  +                  if ((0x7fffffe87fffffeL & l) == 0L)
  +                     break;
  +                  if (kind > 116)
  +                     kind = 116;
  +                  jjCheckNAdd(230);
  +                  break;
  +               case 230:
  +                  if ((0x7fffffe87fffffeL & l) == 0L)
  +                     break;
  +                  if (kind > 116)
  +                     kind = 116;
  +                  jjCheckNAdd(230);
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      else if (curChar < 128)
  -      {
  -         long l = 1L << (curChar & 077);
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
                  default : break;
               }
            } while(i != startsAt);
  @@ -4918,298 +7797,257 @@
            {
               switch(jjstateSet[--i])
               {
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      if (kind != 0x7fffffff)
  -      {
  -         jjmatchedKind = kind;
  -         jjmatchedPos = curPos;
  -         kind = 0x7fffffff;
  -      }
  -      ++curPos;
  -      if ((i = jjnewStateCnt) == (startsAt = 1 - (jjnewStateCnt = startsAt)))
  -         return curPos;
  -      try { curChar = input_stream.readChar(); }
  -      catch(java.io.IOException e) { return curPos; }
  -   }
  -}
  -private final int jjStopStringLiteralDfa_0(int pos, long active0, long 
active1)
  -{
  -   switch (pos)
  -   {
  -      case 0:
  -         if ((active1 & 0x2000000L) != 0L)
  -         {
  -            jjmatchedKind = 115;
  -            return 386;
  -         }
  -         if ((active0 & 0x10000000000000L) != 0L)
  -            return 15;
  -         if ((active0 & 0x2000000000000L) != 0L)
  -         {
  -            jjmatchedKind = 115;
  -            return 330;
  -         }
  -         if ((active1 & 0x300000000000L) != 0L)
  -            return 387;
  -         return -1;
  -      case 1:
  -         if ((active0 & 0x2000000000000L) != 0L || (active1 & 0x2000000L) != 
0L)
  -         {
  -            jjmatchedKind = 115;
  -            jjmatchedPos = 1;
  -            return 386;
  -         }
  -         return -1;
  -      case 2:
  -         if ((active0 & 0x2000000000000L) != 0L || (active1 & 0x2000000L) != 
0L)
  -         {
  -            jjmatchedKind = 115;
  -            jjmatchedPos = 2;
  -            return 386;
  -         }
  -         return -1;
  -      case 3:
  -         if ((active0 & 0x2000000000000L) != 0L || (active1 & 0x2000000L) != 
0L)
  -         {
  -            jjmatchedKind = 115;
  -            jjmatchedPos = 3;
  -            return 386;
  -         }
  -         return -1;
  -      case 4:
  -         if ((active0 & 0x2000000000000L) != 0L)
  -            return 386;
  -         if ((active1 & 0x2000000L) != 0L)
  -         {
  -            jjmatchedKind = 115;
  -            jjmatchedPos = 4;
  -            return 386;
  -         }
  -         return -1;
  -      case 5:
  -         if ((active1 & 0x2000000L) != 0L)
  -         {
  -            jjmatchedKind = 115;
  -            jjmatchedPos = 5;
  -            return 386;
  -         }
  -         return -1;
  -      case 6:
  -         if ((active1 & 0x2000000L) != 0L)
  -         {
  -            jjmatchedKind = 115;
  -            jjmatchedPos = 6;
  -            return 386;
  -         }
  -         return -1;
  -      default :
  -         return -1;
  -   }
  -}
  -private final int jjStartNfa_0(int pos, long active0, long active1)
  -{
  -   return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0, active1), pos + 
1);
  -}
  -private final int jjStartNfaWithStates_0(int pos, int kind, int state)
  -{
  -   jjmatchedKind = kind;
  -   jjmatchedPos = pos;
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) { return pos + 1; }
  -   return jjMoveNfa_0(state, pos + 1);
  -}
  -private final int jjMoveStringLiteralDfa0_0()
  -{
  -   switch(curChar)
  -   {
  -      case 36:
  -         return jjStopAtPos(0, 113);
  -      case 40:
  -         return jjStopAtPos(0, 79);
  -      case 41:
  -         return jjStopAtPos(0, 83);
  -      case 42:
  -         return jjStartNfaWithStates_0(0, 52, 15);
  -      case 43:
  -         return jjStopAtPos(0, 76);
  -      case 44:
  -         return jjStopAtPos(0, 105);
  -      case 45:
  -         return jjStopAtPos(0, 75);
  -      case 46:
  -         jjmatchedKind = 108;
  -         return jjMoveStringLiteralDfa1_0(0x0L, 0x200000000000L);
  -      case 47:
  -         jjmatchedKind = 55;
  -         return jjMoveStringLiteralDfa1_0(0x100000000000000L, 0x0L);
  -      case 64:
  -         return jjStopAtPos(0, 80);
  -      case 91:
  -         return jjStopAtPos(0, 81);
  -      case 93:
  -         return jjStopAtPos(0, 82);
  -      case 101:
  -         return jjMoveStringLiteralDfa1_0(0x2000000000000L, 0x0L);
  -      case 118:
  -         return jjMoveStringLiteralDfa1_0(0x0L, 0x2000000L);
  -      case 125:
  -         return jjStopAtPos(0, 120);
  -      default :
  -         return jjMoveNfa_0(6, 0);
  -   }
  -}
  -private final int jjMoveStringLiteralDfa1_0(long active0, long active1)
  -{
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_0(0, active0, active1);
  -      return 1;
  -   }
  -   switch(curChar)
  -   {
  -      case 46:
  -         if ((active1 & 0x200000000000L) != 0L)
  -            return jjStopAtPos(1, 109);
  -         break;
  -      case 47:
  -         if ((active0 & 0x100000000000000L) != 0L)
  -            return jjStopAtPos(1, 56);
  -         break;
  -      case 97:
  -         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x2000000L);
  -      case 109:
  -         return jjMoveStringLiteralDfa2_0(active0, 0x2000000000000L, 
active1, 0L);
  -      default :
  -         break;
  -   }
  -   return jjStartNfa_0(0, active0, active1);
  -}
  -private final int jjMoveStringLiteralDfa2_0(long old0, long active0, long 
old1, long active1)
  -{
  -   if (((active0 &= old0) | (active1 &= old1)) == 0L)
  -      return jjStartNfa_0(0, old0, old1); 
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_0(1, active0, active1);
  -      return 2;
  -   }
  -   switch(curChar)
  -   {
  -      case 108:
  -         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x2000000L);
  -      case 112:
  -         return jjMoveStringLiteralDfa3_0(active0, 0x2000000000000L, 
active1, 0L);
  -      default :
  -         break;
  -   }
  -   return jjStartNfa_0(1, active0, active1);
  -}
  -private final int jjMoveStringLiteralDfa3_0(long old0, long active0, long 
old1, long active1)
  -{
  -   if (((active0 &= old0) | (active1 &= old1)) == 0L)
  -      return jjStartNfa_0(1, old0, old1); 
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_0(2, active0, active1);
  -      return 3;
  -   }
  -   switch(curChar)
  -   {
  -      case 105:
  -         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x2000000L);
  -      case 116:
  -         return jjMoveStringLiteralDfa4_0(active0, 0x2000000000000L, 
active1, 0L);
  -      default :
  -         break;
  +               case 179:
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                     jjCheckNAddTwoStates(224, 225);
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                     jjCheckNAddTwoStates(227, 228);
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                  {
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(230);
  +                  }
  +                  break;
  +               case 23:
  +                  if ((jjbitVec5[i2] & l2) == 0L)
  +                     break;
  +                  if (kind > 116)
  +                     kind = 116;
  +                  jjCheckNAddStates(393, 397);
  +                  break;
  +               case 231:
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                     jjCheckNAddTwoStates(224, 225);
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                     jjCheckNAddTwoStates(227, 228);
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                  {
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(230);
  +                  }
  +                  break;
  +               case 21:
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                     jjCheckNAddTwoStates(224, 225);
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                     jjCheckNAddTwoStates(227, 228);
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                  {
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(230);
  +                  }
  +                  break;
  +               case 71:
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                     jjCheckNAddTwoStates(224, 225);
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                     jjCheckNAddTwoStates(227, 228);
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                  {
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(230);
  +                  }
  +                  break;
  +               case 85:
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                     jjCheckNAddTwoStates(224, 225);
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                     jjCheckNAddTwoStates(227, 228);
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                  {
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(230);
  +                  }
  +                  break;
  +               case 42:
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                     jjCheckNAddTwoStates(224, 225);
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                     jjCheckNAddTwoStates(227, 228);
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                  {
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(230);
  +                  }
  +                  break;
  +               case 40:
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                     jjCheckNAddTwoStates(224, 225);
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                     jjCheckNAddTwoStates(227, 228);
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                  {
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(230);
  +                  }
  +                  break;
  +               case 22:
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                     jjCheckNAddTwoStates(224, 225);
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                     jjCheckNAddTwoStates(227, 228);
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                  {
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAdd(230);
  +                  }
  +                  break;
  +               case 1:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(243, 244);
  +                  break;
  +               case 4:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(245, 246);
  +                  break;
  +               case 9:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(401, 402);
  +                  break;
  +               case 27:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(403, 404);
  +                  break;
  +               case 45:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(405, 406);
  +                  break;
  +               case 58:
  +                  if ((jjbitVec5[i2] & l2) == 0L)
  +                     break;
  +                  if (kind > 59)
  +                     kind = 59;
  +                  jjCheckNAdd(59);
  +                  break;
  +               case 59:
  +                  if ((jjbitVec28[i2] & l2) == 0L)
  +                     break;
  +                  if (kind > 59)
  +                     kind = 59;
  +                  jjCheckNAdd(59);
  +                  break;
  +               case 63:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(407, 408);
  +                  break;
  +               case 76:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(409, 410);
  +                  break;
  +               case 90:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(411, 412);
  +                  break;
  +               case 102:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(413, 414);
  +                  break;
  +               case 132:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(417, 418);
  +                  break;
  +               case 138:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(419, 420);
  +                  break;
  +               case 151:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(423, 424);
  +                  break;
  +               case 158:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(425, 426);
  +                  break;
  +               case 183:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(427, 428);
  +                  break;
  +               case 204:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(429, 430);
  +                  break;
  +               case 224:
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                     jjCheckNAddTwoStates(224, 225);
  +                  break;
  +               case 227:
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                     jjCheckNAddTwoStates(227, 228);
  +                  break;
  +               case 229:
  +                  if ((jjbitVec5[i2] & l2) == 0L)
  +                     break;
  +                  if (kind > 116)
  +                     kind = 116;
  +                  jjCheckNAdd(230);
  +                  break;
  +               case 230:
  +                  if ((jjbitVec28[i2] & l2) == 0L)
  +                     break;
  +                  if (kind > 116)
  +                     kind = 116;
  +                  jjCheckNAdd(230);
  +                  break;
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      if (kind != 0x7fffffff)
  +      {
  +         jjmatchedKind = kind;
  +         jjmatchedPos = curPos;
  +         kind = 0x7fffffff;
  +      }
  +      ++curPos;
  +      if ((i = jjnewStateCnt) == (startsAt = 231 - (jjnewStateCnt = 
startsAt)))
  +         return curPos;
  +      try { curChar = input_stream.readChar(); }
  +      catch(java.io.IOException e) { return curPos; }
      }
  -   return jjStartNfa_0(2, active0, active1);
   }
  -private final int jjMoveStringLiteralDfa4_0(long old0, long active0, long 
old1, long active1)
  +private final int jjStopStringLiteralDfa_8(int pos, long active0, long 
active1)
   {
  -   if (((active0 &= old0) | (active1 &= old1)) == 0L)
  -      return jjStartNfa_0(2, old0, old1); 
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_0(3, active0, active1);
  -      return 4;
  -   }
  -   switch(curChar)
  +   switch (pos)
      {
  -      case 100:
  -         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x2000000L);
  -      case 121:
  -         if ((active0 & 0x2000000000000L) != 0L)
  -            return jjStartNfaWithStates_0(4, 49, 386);
  -         break;
         default :
  -         break;
  +         return -1;
      }
  -   return jjStartNfa_0(3, active0, active1);
   }
  -private final int jjMoveStringLiteralDfa5_0(long old0, long active0, long 
old1, long active1)
  +private final int jjStartNfa_8(int pos, long active0, long active1)
   {
  -   if (((active0 &= old0) | (active1 &= old1)) == 0L)
  -      return jjStartNfa_0(3, old0, old1); 
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_0(4, 0L, active1);
  -      return 5;
  -   }
  -   switch(curChar)
  -   {
  -      case 97:
  -         return jjMoveStringLiteralDfa6_0(active1, 0x2000000L);
  -      default :
  -         break;
  -   }
  -   return jjStartNfa_0(4, 0L, active1);
  +   return jjMoveNfa_8(jjStopStringLiteralDfa_8(pos, active0, active1), pos + 
1);
   }
  -private final int jjMoveStringLiteralDfa6_0(long old1, long active1)
  +private final int jjStartNfaWithStates_8(int pos, int kind, int state)
   {
  -   if (((active1 &= old1)) == 0L)
  -      return jjStartNfa_0(4, 0L, old1); 
  +   jjmatchedKind = kind;
  +   jjmatchedPos = pos;
      try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_0(5, 0L, active1);
  -      return 6;
  -   }
  -   switch(curChar)
  -   {
  -      case 116:
  -         return jjMoveStringLiteralDfa7_0(active1, 0x2000000L);
  -      default :
  -         break;
  -   }
  -   return jjStartNfa_0(5, 0L, active1);
  +   catch(java.io.IOException e) { return pos + 1; }
  +   return jjMoveNfa_8(state, pos + 1);
   }
  -private final int jjMoveStringLiteralDfa7_0(long old1, long active1)
  +private final int jjMoveStringLiteralDfa0_8()
   {
  -   if (((active1 &= old1)) == 0L)
  -      return jjStartNfa_0(5, 0L, old1); 
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_0(6, 0L, active1);
  -      return 7;
  -   }
      switch(curChar)
      {
  -      case 101:
  -         if ((active1 & 0x2000000L) != 0L)
  -            return jjStartNfaWithStates_0(7, 89, 386);
  -         break;
  +      case 123:
  +         return jjStartNfaWithStates_8(0, 118, 5);
         default :
  -         break;
  +         return jjMoveNfa_8(6, 0);
      }
  -   return jjStartNfa_0(6, 0L, active1);
   }
  -private final int jjMoveNfa_0(int startState, int curPos)
  +private final int jjMoveNfa_8(int startState, int curPos)
   {
      int[] nextStates;
      int startsAt = 0;
  -   jjnewStateCnt = 386;
  +   jjnewStateCnt = 8;
      int i = 1;
      jjstateSet[0] = startState;
      int j, kind = 0x7fffffff;
  @@ -5224,95 +8062,9 @@
            {
               switch(jjstateSet[--i])
               {
  -               case 330:
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddStates(102, 104);
  -                  else if ((0x100002600L & l) != 0L)
  -                     jjCheckNAddTwoStates(357, 358);
  -                  else if (curChar == 40)
  -                  {
  -                     if (kind > 118)
  -                        kind = 118;
  -                  }
  -                  else if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 355;
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(353, 354);
  -                  else if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 351;
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                  {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(352);
  -                  }
  -                  else if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 348;
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(349, 350);
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(346, 347);
  -                  break;
                  case 6:
  -                  if ((0x3ff000000000000L & l) != 0L)
  -                  {
  -                     if (kind > 91)
  -                        kind = 91;
  -                     jjCheckNAddStates(105, 110);
  -                  }
  -                  else if ((0x100002600L & l) != 0L)
  -                  {
  -                     if (kind > 2)
  -                        kind = 2;
  -                     jjCheckNAddTwoStates(29, 30);
  -                  }
  -                  else if (curChar == 46)
  -                     jjCheckNAddTwoStates(384, 385);
  -                  else if (curChar == 39)
  -                     jjCheckNAddTwoStates(26, 27);
  -                  else if (curChar == 34)
  -                     jjCheckNAddTwoStates(23, 24);
  -                  else if (curChar == 42)
  -                     jjstateSet[jjnewStateCnt++] = 15;
  -                  break;
  -               case 387:
  -                  if ((0x3ff000000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(385, 380);
  -                  if ((0x3ff000000000000L & l) != 0L)
  -                  {
  -                     if (kind > 92)
  -                        kind = 92;
  -                     jjCheckNAdd(384);
  -                  }
  -                  break;
  -               case 386:
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddStates(102, 104);
  -                  else if ((0x100002600L & l) != 0L)
  -                     jjCheckNAddTwoStates(357, 358);
  -                  else if (curChar == 40)
  -                  {
  -                     if (kind > 118)
  -                        kind = 118;
  -                  }
  -                  else if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 355;
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(353, 354);
  -                  else if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 351;
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                  {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(352);
  -                  }
  -                  else if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 348;
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(349, 350);
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(346, 347);
  +                  if ((0xffffffff00002600L & l) != 0L && kind > 121)
  +                     kind = 121;
                     break;
                  case 0:
                     if (curChar == 45)
  @@ -5333,2169 +8085,2371 @@
                     if (curChar == 45)
                        jjstateSet[jjnewStateCnt++] = 0;
                     break;
  -               case 8:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(111, 112);
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      else if (curChar < 128)
  +      {
  +         long l = 1L << (curChar & 077);
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 6:
  +                  if (kind > 121)
  +                     kind = 121;
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 5;
                     break;
  -               case 14:
  -                  if (curChar == 42)
  -                     jjstateSet[jjnewStateCnt++] = 15;
  +               case 1:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(431, 432);
                     break;
  -               case 15:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 16;
  +               case 2:
  +                  if (curChar == 125 && kind > 5)
  +                     kind = 5;
                     break;
  -               case 17:
  -                  if ((0x3ff600000000000L & l) == 0L)
  -                     break;
  -                  if (kind > 54)
  -                     kind = 54;
  -                  jjstateSet[jjnewStateCnt++] = 17;
  +               case 7:
  +                  if (kind > 121)
  +                     kind = 121;
                     break;
  -               case 19:
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      else
  +      {
  +         int i2 = (curChar & 0xff) >> 6;
  +         long l2 = 1L << (curChar & 077);
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 6:
  +                  if ((jjbitVec0[i2] & l2) != 0L && kind > 121)
  +                     kind = 121;
  +                  break;
  +               case 1:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(431, 432);
  +                  break;
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      if (kind != 0x7fffffff)
  +      {
  +         jjmatchedKind = kind;
  +         jjmatchedPos = curPos;
  +         kind = 0x7fffffff;
  +      }
  +      ++curPos;
  +      if ((i = jjnewStateCnt) == (startsAt = 8 - (jjnewStateCnt = startsAt)))
  +         return curPos;
  +      try { curChar = input_stream.readChar(); }
  +      catch(java.io.IOException e) { return curPos; }
  +   }
  +}
  +private final int jjMoveStringLiteralDfa0_2()
  +{
  +   return jjMoveNfa_2(6, 0);
  +}
  +private final int jjMoveNfa_2(int startState, int curPos)
  +{
  +   int[] nextStates;
  +   int startsAt = 0;
  +   jjnewStateCnt = 23;
  +   int i = 1;
  +   jjstateSet[0] = startState;
  +   int j, kind = 0x7fffffff;
  +   for (;;)
  +   {
  +      if (++jjround == 0x7fffffff)
  +         ReInitRounds();
  +      if (curChar < 64)
  +      {
  +         long l = 1L << curChar;
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 6:
                     if ((0x100002600L & l) != 0L)
  -                     jjAddStates(113, 114);
  -                  break;
  -               case 20:
  -                  if (curChar == 40 && kind > 104)
  -                     kind = 104;
  +                  {
  +                     if (kind > 6)
  +                        kind = 6;
  +                     jjCheckNAddStates(433, 435);
  +                  }
  +                  else if (curChar == 39)
  +                     jjCheckNAddTwoStates(4, 5);
  +                  else if (curChar == 34)
  +                     jjCheckNAddTwoStates(1, 2);
                     break;
  -               case 22:
  +               case 0:
                     if (curChar == 34)
  -                     jjCheckNAddTwoStates(23, 24);
  +                     jjCheckNAddTwoStates(1, 2);
                     break;
  -               case 23:
  +               case 1:
                     if ((0xfffffffbffffffffL & l) != 0L)
  -                     jjCheckNAddTwoStates(23, 24);
  +                     jjCheckNAddTwoStates(1, 2);
                     break;
  -               case 24:
  +               case 2:
                     if (curChar != 34)
                        break;
  -                  if (kind > 106)
  -                     kind = 106;
  -                  jjstateSet[jjnewStateCnt++] = 22;
  +                  if (kind > 4)
  +                     kind = 4;
  +                  jjstateSet[jjnewStateCnt++] = 0;
                     break;
  -               case 25:
  +               case 3:
                     if (curChar == 39)
  -                     jjCheckNAddTwoStates(26, 27);
  +                     jjCheckNAddTwoStates(4, 5);
                     break;
  -               case 26:
  +               case 4:
                     if ((0xffffff7fffffffffL & l) != 0L)
  -                     jjCheckNAddTwoStates(26, 27);
  +                     jjCheckNAddTwoStates(4, 5);
                     break;
  -               case 27:
  +               case 5:
                     if (curChar != 39)
                        break;
  -                  if (kind > 106)
  -                     kind = 106;
  -                  jjstateSet[jjnewStateCnt++] = 25;
  -                  break;
  -               case 28:
  -                  if ((0x100002600L & l) == 0L)
  -                     break;
  -                  if (kind > 2)
  -                     kind = 2;
  -                  jjCheckNAddTwoStates(29, 30);
  -                  break;
  -               case 29:
  -                  if ((0x100002600L & l) == 0L)
  -                     break;
  -                  if (kind > 2)
  -                     kind = 2;
  -                  jjCheckNAdd(29);
  -                  break;
  -               case 30:
  -                  if ((0x100002600L & l) == 0L)
  -                     break;
                     if (kind > 4)
                        kind = 4;
  -                  jjCheckNAdd(30);
  +                  jjstateSet[jjnewStateCnt++] = 3;
                     break;
  -               case 33:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(115, 116);
  +               case 7:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(8, 11);
                     break;
  -               case 34:
  -                  if (curChar == 58 && kind > 5)
  -                     kind = 5;
  +               case 8:
  +                  jjCheckNAddTwoStates(8, 11);
                     break;
  -               case 35:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 34;
  +               case 10:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 9;
                     break;
  -               case 40:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(117, 118);
  +               case 11:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 10;
                     break;
  -               case 46:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(119, 120);
  +               case 12:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 7;
                     break;
  -               case 47:
  -                  if (curChar == 40 && kind > 101)
  -                     kind = 101;
  +               case 13:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(14, 20);
                     break;
  -               case 55:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(121, 122);
  +               case 14:
  +                  jjCheckNAddTwoStates(14, 20);
                     break;
  -               case 56:
  -                  if (curChar == 58 && kind > 6)
  +               case 16:
  +                  if ((0x100002600L & l) == 0L)
  +                     break;
  +                  if (kind > 6)
                        kind = 6;
  +                  jjCheckNAddTwoStates(16, 18);
                     break;
  -               case 57:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 56;
  -                  break;
  -               case 67:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(123, 124);
  -                  break;
  -               case 68:
  -                  if (curChar == 58 && kind > 10)
  -                     kind = 10;
  -                  break;
  -               case 69:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 68;
  -                  break;
  -               case 73:
  +               case 17:
                     if (curChar == 45)
  -                     jjstateSet[jjnewStateCnt++] = 72;
  +                     jjstateSet[jjnewStateCnt++] = 13;
                     break;
  -               case 76:
  +               case 19:
                     if (curChar == 45)
  -                     jjstateSet[jjnewStateCnt++] = 75;
  -                  break;
  -               case 87:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(125, 126);
  -                  break;
  -               case 101:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(127, 128);
  -                  break;
  -               case 116:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(129, 130);
  -                  break;
  -               case 126:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(131, 132);
  -                  break;
  -               case 127:
  -                  if (curChar == 58 && kind > 7)
  -                     kind = 7;
  -                  break;
  -               case 128:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 127;
  -                  break;
  -               case 134:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(133, 134);
  -                  break;
  -               case 135:
  -                  if (curChar == 58 && kind > 13)
  -                     kind = 13;
  -                  break;
  -               case 136:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 135;
  +                     jjstateSet[jjnewStateCnt++] = 15;
                     break;
  -               case 143:
  +               case 20:
                     if (curChar == 45)
  -                     jjstateSet[jjnewStateCnt++] = 142;
  -                  break;
  -               case 153:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(135, 136);
  +                     jjstateSet[jjnewStateCnt++] = 19;
                     break;
  -               case 154:
  -                  if (curChar == 58 && kind > 15)
  -                     kind = 15;
  +               case 21:
  +                  if ((0x100002600L & l) == 0L)
  +                     break;
  +                  if (kind > 6)
  +                     kind = 6;
  +                  jjCheckNAddStates(433, 435);
                     break;
  -               case 155:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 154;
  +               case 22:
  +                  if ((0x100002600L & l) == 0L)
  +                     break;
  +                  if (kind > 8)
  +                     kind = 8;
  +                  jjCheckNAdd(22);
                     break;
  -               case 164:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(137, 138);
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      else if (curChar < 128)
  +      {
  +         long l = 1L << (curChar & 077);
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 6:
  +                  if (curChar == 123)
  +                     jjCheckNAddTwoStates(12, 17);
                     break;
  -               case 165:
  -                  if (curChar == 40 && kind > 103)
  -                     kind = 103;
  +               case 1:
  +                  jjAddStates(243, 244);
                     break;
  -               case 176:
  -                  if (curChar == 45)
  -                     jjstateSet[jjnewStateCnt++] = 175;
  +               case 4:
  +                  jjAddStates(245, 246);
                     break;
  -               case 188:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(139, 140);
  +               case 8:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(436, 437);
                     break;
  -               case 189:
  -                  if (curChar == 58 && kind > 8)
  -                     kind = 8;
  +               case 9:
  +                  if (curChar == 125 && kind > 5)
  +                     kind = 5;
                     break;
  -               case 190:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 189;
  +               case 14:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(438, 439);
                     break;
  -               case 199:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(141, 142);
  +               case 15:
  +                  if (curChar != 125)
  +                     break;
  +                  if (kind > 6)
  +                     kind = 6;
  +                  jjAddStates(440, 441);
                     break;
  -               case 200:
  -                  if (curChar == 58 && kind > 11)
  -                     kind = 11;
  +               case 18:
  +                  if (curChar == 123)
  +                     jjCheckNAdd(17);
                     break;
  -               case 201:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 200;
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      else
  +      {
  +         int i2 = (curChar & 0xff) >> 6;
  +         long l2 = 1L << (curChar & 077);
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 1:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(243, 244);
                     break;
  -               case 209:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(143, 144);
  +               case 4:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(245, 246);
                     break;
  -               case 210:
  -                  if (curChar == 58 && kind > 17)
  -                     kind = 17;
  +               case 8:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(436, 437);
                     break;
  -               case 211:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 210;
  +               case 14:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(438, 439);
                     break;
  -               case 215:
  -                  if (curChar == 45)
  -                     jjstateSet[jjnewStateCnt++] = 214;
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      if (kind != 0x7fffffff)
  +      {
  +         jjmatchedKind = kind;
  +         jjmatchedPos = curPos;
  +         kind = 0x7fffffff;
  +      }
  +      ++curPos;
  +      if ((i = jjnewStateCnt) == (startsAt = 23 - (jjnewStateCnt = 
startsAt)))
  +         return curPos;
  +      try { curChar = input_stream.readChar(); }
  +      catch(java.io.IOException e) { return curPos; }
  +   }
  +}
  +private final int jjMoveStringLiteralDfa0_14()
  +{
  +   return jjMoveNfa_14(0, 0);
  +}
  +private final int jjMoveNfa_14(int startState, int curPos)
  +{
  +   int[] nextStates;
  +   int startsAt = 0;
  +   jjnewStateCnt = 1;
  +   int i = 1;
  +   jjstateSet[0] = startState;
  +   int j, kind = 0x7fffffff;
  +   for (;;)
  +   {
  +      if (++jjround == 0x7fffffff)
  +         ReInitRounds();
  +      if (curChar < 64)
  +      {
  +         long l = 1L << curChar;
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 0:
  +                  if ((0xffffffff00002600L & l) != 0L)
  +                     kind = 121;
                     break;
  -               case 218:
  -                  if (curChar == 45)
  -                     jjstateSet[jjnewStateCnt++] = 217;
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      else if (curChar < 128)
  +      {
  +         long l = 1L << (curChar & 077);
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 0:
  +                  kind = 121;
                     break;
  -               case 227:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(145, 146);
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      else
  +      {
  +         int i2 = (curChar & 0xff) >> 6;
  +         long l2 = 1L << (curChar & 077);
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 0:
  +                  if ((jjbitVec0[i2] & l2) != 0L && kind > 121)
  +                     kind = 121;
                     break;
  -               case 229:
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                     jjAddStates(147, 148);
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      if (kind != 0x7fffffff)
  +      {
  +         jjmatchedKind = kind;
  +         jjmatchedPos = curPos;
  +         kind = 0x7fffffff;
  +      }
  +      ++curPos;
  +      if ((i = jjnewStateCnt) == (startsAt = 1 - (jjnewStateCnt = startsAt)))
  +         return curPos;
  +      try { curChar = input_stream.readChar(); }
  +      catch(java.io.IOException e) { return curPos; }
  +   }
  +}
  +private final int jjStopStringLiteralDfa_11(int pos, long active0, long 
active1)
  +{
  +   switch (pos)
  +   {
  +      default :
  +         return -1;
  +   }
  +}
  +private final int jjStartNfa_11(int pos, long active0, long active1)
  +{
  +   return jjMoveNfa_11(jjStopStringLiteralDfa_11(pos, active0, active1), pos 
+ 1);
  +}
  +private final int jjStartNfaWithStates_11(int pos, int kind, int state)
  +{
  +   jjmatchedKind = kind;
  +   jjmatchedPos = pos;
  +   try { curChar = input_stream.readChar(); }
  +   catch(java.io.IOException e) { return pos + 1; }
  +   return jjMoveNfa_11(state, pos + 1);
  +}
  +private final int jjMoveStringLiteralDfa0_11()
  +{
  +   switch(curChar)
  +   {
  +      case 123:
  +         return jjStopAtPos(0, 118);
  +      case 125:
  +         return jjStopAtPos(0, 120);
  +      default :
  +         return jjMoveNfa_11(0, 0);
  +   }
  +}
  +private final int jjMoveNfa_11(int startState, int curPos)
  +{
  +   int[] nextStates;
  +   int startsAt = 0;
  +   jjnewStateCnt = 1;
  +   int i = 1;
  +   jjstateSet[0] = startState;
  +   int j, kind = 0x7fffffff;
  +   for (;;)
  +   {
  +      if (++jjround == 0x7fffffff)
  +         ReInitRounds();
  +      if (curChar < 64)
  +      {
  +         long l = 1L << curChar;
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 0:
  +                  if ((0xffffffff00002600L & l) != 0L)
  +                     kind = 121;
                     break;
  -               case 230:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 231;
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      else if (curChar < 128)
  +      {
  +         long l = 1L << (curChar & 077);
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 0:
  +                  kind = 121;
                     break;
  -               case 232:
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(232, 233);
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      else
  +      {
  +         int i2 = (curChar & 0xff) >> 6;
  +         long l2 = 1L << (curChar & 077);
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 0:
  +                  if ((jjbitVec0[i2] & l2) != 0L && kind > 121)
  +                     kind = 121;
                     break;
  -               case 233:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjCheckNAddTwoStates(233, 234);
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      if (kind != 0x7fffffff)
  +      {
  +         jjmatchedKind = kind;
  +         jjmatchedPos = curPos;
  +         kind = 0x7fffffff;
  +      }
  +      ++curPos;
  +      if ((i = jjnewStateCnt) == (startsAt = 1 - (jjnewStateCnt = startsAt)))
  +         return curPos;
  +      try { curChar = input_stream.readChar(); }
  +      catch(java.io.IOException e) { return curPos; }
  +   }
  +}
  +private final int jjMoveStringLiteralDfa0_16()
  +{
  +   return jjMoveNfa_16(0, 0);
  +}
  +private final int jjMoveNfa_16(int startState, int curPos)
  +{
  +   int[] nextStates;
  +   int startsAt = 0;
  +   jjnewStateCnt = 1;
  +   int i = 1;
  +   jjstateSet[0] = startState;
  +   int j, kind = 0x7fffffff;
  +   for (;;)
  +   {
  +      if (++jjround == 0x7fffffff)
  +         ReInitRounds();
  +      if (curChar < 64)
  +      {
  +         long l = 1L << curChar;
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 0:
  +                  if ((0xffffffff00002600L & l) != 0L)
  +                     kind = 121;
                     break;
  -               case 243:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(149, 150);
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      else if (curChar < 128)
  +      {
  +         long l = 1L << (curChar & 077);
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 0:
  +                  kind = 121;
                     break;
  -               case 254:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(151, 152);
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      else
  +      {
  +         int i2 = (curChar & 0xff) >> 6;
  +         long l2 = 1L << (curChar & 077);
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 0:
  +                  if ((jjbitVec0[i2] & l2) != 0L && kind > 121)
  +                     kind = 121;
                     break;
  -               case 255:
  -                  if (curChar == 58 && kind > 9)
  -                     kind = 9;
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      if (kind != 0x7fffffff)
  +      {
  +         jjmatchedKind = kind;
  +         jjmatchedPos = curPos;
  +         kind = 0x7fffffff;
  +      }
  +      ++curPos;
  +      if ((i = jjnewStateCnt) == (startsAt = 1 - (jjnewStateCnt = startsAt)))
  +         return curPos;
  +      try { curChar = input_stream.readChar(); }
  +      catch(java.io.IOException e) { return curPos; }
  +   }
  +}
  +private final int jjStopStringLiteralDfa_9(int pos, long active0, long 
active1)
  +{
  +   switch (pos)
  +   {
  +      default :
  +         return -1;
  +   }
  +}
  +private final int jjStartNfa_9(int pos, long active0, long active1)
  +{
  +   return jjMoveNfa_9(jjStopStringLiteralDfa_9(pos, active0, active1), pos + 
1);
  +}
  +private final int jjStartNfaWithStates_9(int pos, int kind, int state)
  +{
  +   jjmatchedKind = kind;
  +   jjmatchedPos = pos;
  +   try { curChar = input_stream.readChar(); }
  +   catch(java.io.IOException e) { return pos + 1; }
  +   return jjMoveNfa_9(state, pos + 1);
  +}
  +private final int jjMoveStringLiteralDfa0_9()
  +{
  +   switch(curChar)
  +   {
  +      case 123:
  +         return jjStopAtPos(0, 118);
  +      default :
  +         return jjMoveNfa_9(0, 0);
  +   }
  +}
  +private final int jjMoveNfa_9(int startState, int curPos)
  +{
  +   int[] nextStates;
  +   int startsAt = 0;
  +   jjnewStateCnt = 1;
  +   int i = 1;
  +   jjstateSet[0] = startState;
  +   int j, kind = 0x7fffffff;
  +   for (;;)
  +   {
  +      if (++jjround == 0x7fffffff)
  +         ReInitRounds();
  +      if (curChar < 64)
  +      {
  +         long l = 1L << curChar;
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 0:
  +                  if ((0x100002600L & l) == 0L)
  +                     break;
  +                  kind = 8;
  +                  jjstateSet[jjnewStateCnt++] = 0;
                     break;
  -               case 256:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 255;
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      else if (curChar < 128)
  +      {
  +         long l = 1L << (curChar & 077);
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      else
  +      {
  +         int i2 = (curChar & 0xff) >> 6;
  +         long l2 = 1L << (curChar & 077);
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      if (kind != 0x7fffffff)
  +      {
  +         jjmatchedKind = kind;
  +         jjmatchedPos = curPos;
  +         kind = 0x7fffffff;
  +      }
  +      ++curPos;
  +      if ((i = jjnewStateCnt) == (startsAt = 1 - (jjnewStateCnt = startsAt)))
  +         return curPos;
  +      try { curChar = input_stream.readChar(); }
  +      catch(java.io.IOException e) { return curPos; }
  +   }
  +}
  +private final int jjMoveStringLiteralDfa0_13()
  +{
  +   return jjMoveNfa_13(0, 0);
  +}
  +private final int jjMoveNfa_13(int startState, int curPos)
  +{
  +   int[] nextStates;
  +   int startsAt = 0;
  +   jjnewStateCnt = 1;
  +   int i = 1;
  +   jjstateSet[0] = startState;
  +   int j, kind = 0x7fffffff;
  +   for (;;)
  +   {
  +      if (++jjround == 0x7fffffff)
  +         ReInitRounds();
  +      if (curChar < 64)
  +      {
  +         long l = 1L << curChar;
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 0:
  +                  if ((0xffffffff00002600L & l) != 0L)
  +                     kind = 121;
                     break;
  -               case 260:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(153, 154);
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      else if (curChar < 128)
  +      {
  +         long l = 1L << (curChar & 077);
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 0:
  +                  kind = 121;
                     break;
  -               case 261:
  -                  if (curChar == 36 && kind > 84)
  -                     kind = 84;
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      else
  +      {
  +         int i2 = (curChar & 0xff) >> 6;
  +         long l2 = 1L << (curChar & 077);
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 0:
  +                  if ((jjbitVec0[i2] & l2) != 0L && kind > 121)
  +                     kind = 121;
                     break;
  -               case 266:
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      if (kind != 0x7fffffff)
  +      {
  +         jjmatchedKind = kind;
  +         jjmatchedPos = curPos;
  +         kind = 0x7fffffff;
  +      }
  +      ++curPos;
  +      if ((i = jjnewStateCnt) == (startsAt = 1 - (jjnewStateCnt = startsAt)))
  +         return curPos;
  +      try { curChar = input_stream.readChar(); }
  +      catch(java.io.IOException e) { return curPos; }
  +   }
  +}
  +private final int jjStopStringLiteralDfa_3(int pos, long active0, long 
active1)
  +{
  +   switch (pos)
  +   {
  +      case 0:
  +         if ((active0 & 0x200000000000000L) != 0L)
  +            return 15;
  +         return -1;
  +      default :
  +         return -1;
  +   }
  +}
  +private final int jjStartNfa_3(int pos, long active0, long active1)
  +{
  +   return jjMoveNfa_3(jjStopStringLiteralDfa_3(pos, active0, active1), pos + 
1);
  +}
  +private final int jjStartNfaWithStates_3(int pos, int kind, int state)
  +{
  +   jjmatchedKind = kind;
  +   jjmatchedPos = pos;
  +   try { curChar = input_stream.readChar(); }
  +   catch(java.io.IOException e) { return pos + 1; }
  +   return jjMoveNfa_3(state, pos + 1);
  +}
  +private final int jjMoveStringLiteralDfa0_3()
  +{
  +   switch(curChar)
  +   {
  +      case 36:
  +         return jjStopAtPos(0, 114);
  +      case 40:
  +         return jjStopAtPos(0, 84);
  +      case 41:
  +         return jjStopAtPos(0, 88);
  +      case 42:
  +         return jjStartNfaWithStates_3(0, 57, 15);
  +      case 44:
  +         return jjStopAtPos(0, 108);
  +      case 46:
  +         jjmatchedKind = 109;
  +         return jjMoveStringLiteralDfa1_3(0x0L, 0x400000000000L);
  +      case 47:
  +         jjmatchedKind = 60;
  +         return jjMoveStringLiteralDfa1_3(0x2000000000000000L, 0x0L);
  +      case 64:
  +         return jjStopAtPos(0, 85);
  +      default :
  +         return jjMoveNfa_3(13, 0);
  +   }
  +}
  +private final int jjMoveStringLiteralDfa1_3(long active0, long active1)
  +{
  +   try { curChar = input_stream.readChar(); }
  +   catch(java.io.IOException e) {
  +      jjStopStringLiteralDfa_3(0, active0, active1);
  +      return 1;
  +   }
  +   switch(curChar)
  +   {
  +      case 46:
  +         if ((active1 & 0x400000000000L) != 0L)
  +            return jjStopAtPos(1, 110);
  +         break;
  +      case 47:
  +         if ((active0 & 0x2000000000000000L) != 0L)
  +            return jjStopAtPos(1, 61);
  +         break;
  +      default :
  +         break;
  +   }
  +   return jjStartNfa_3(0, active0, active1);
  +}
  +private final int jjMoveNfa_3(int startState, int curPos)
  +{
  +   int[] nextStates;
  +   int startsAt = 0;
  +   jjnewStateCnt = 360;
  +   int i = 1;
  +   jjstateSet[0] = startState;
  +   int j, kind = 0x7fffffff;
  +   for (;;)
  +   {
  +      if (++jjround == 0x7fffffff)
  +         ReInitRounds();
  +      if (curChar < 64)
  +      {
  +         long l = 1L << curChar;
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 13:
                     if ((0x100002600L & l) != 0L)
  -                     jjAddStates(155, 156);
  -                  break;
  -               case 267:
  -                  if (curChar == 58 && kind > 12)
  -                     kind = 12;
  +                  {
  +                     if (kind > 6)
  +                        kind = 6;
  +                     jjCheckNAddStates(442, 444);
  +                  }
  +                  else if (curChar == 42)
  +                     jjstateSet[jjnewStateCnt++] = 15;
                     break;
  -               case 268:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 267;
  +               case 1:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(445, 447);
                     break;
  -               case 275:
  +               case 2:
                     if (curChar == 45)
  -                     jjstateSet[jjnewStateCnt++] = 274;
  +                     jjCheckNAddTwoStates(3, 10);
                     break;
  -               case 285:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(157, 158);
  +               case 3:
  +                  jjCheckNAddTwoStates(3, 10);
                     break;
  -               case 286:
  -                  if (curChar == 58 && kind > 14)
  -                     kind = 14;
  +               case 5:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 2;
                     break;
  -               case 287:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 286;
  +               case 7:
  +                  if (curChar == 58 && kind > 13)
  +                     kind = 13;
                     break;
  -               case 296:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(159, 160);
  +               case 8:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 7;
                     break;
  -               case 297:
  -                  if (curChar == 36 && kind > 86)
  -                     kind = 86;
  +               case 9:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 4;
                     break;
  -               case 301:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(161, 162);
  +               case 10:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 9;
                     break;
  -               case 302:
  -                  if (curChar == 58 && kind > 16)
  -                     kind = 16;
  +               case 14:
  +                  if (curChar == 42)
  +                     jjstateSet[jjnewStateCnt++] = 15;
                     break;
  -               case 303:
  +               case 15:
                     if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 302;
  -                  break;
  -               case 312:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(163, 164);
  +                     jjstateSet[jjnewStateCnt++] = 16;
                     break;
  -               case 313:
  -                  if (curChar == 40 && kind > 100)
  -                     kind = 100;
  +               case 17:
  +                  if ((0x3ff600000000000L & l) == 0L)
  +                     break;
  +                  if (kind > 59)
  +                     kind = 59;
  +                  jjstateSet[jjnewStateCnt++] = 17;
                     break;
  -               case 318:
  +               case 19:
                     if ((0x100002600L & l) != 0L)
  -                     jjAddStates(165, 166);
  +                     jjAddStates(448, 450);
                     break;
  -               case 320:
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                     jjAddStates(167, 168);
  +               case 20:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(21, 27);
                     break;
  -               case 321:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 322;
  +               case 21:
  +                  jjCheckNAddTwoStates(21, 27);
                     break;
  -               case 323:
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(323, 324);
  +               case 23:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 20;
                     break;
  -               case 324:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjCheckNAddTwoStates(324, 325);
  +               case 25:
  +                  if (curChar == 40 && kind > 105)
  +                     kind = 105;
                     break;
  -               case 332:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(169, 170);
  +               case 26:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 22;
                     break;
  -               case 340:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(171, 172);
  +               case 27:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 26;
                     break;
  -               case 341:
  -                  if (curChar == 36 && kind > 85)
  -                     kind = 85;
  +               case 32:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(33, 36);
                     break;
  -               case 346:
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(346, 347);
  +               case 33:
  +                  jjCheckNAddTwoStates(33, 36);
                     break;
  -               case 347:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 348;
  +               case 35:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 34;
                     break;
  -               case 348:
  -                  if (curChar == 42 && kind > 53)
  -                     kind = 53;
  +               case 36:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 35;
                     break;
  -               case 349:
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(349, 350);
  +               case 37:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 32;
                     break;
  -               case 350:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 351;
  +               case 38:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(39, 45);
                     break;
  -               case 352:
  -                  if ((0x3ff600000000000L & l) == 0L)
  +               case 39:
  +                  jjCheckNAddTwoStates(39, 45);
  +                  break;
  +               case 41:
  +                  if ((0x100002600L & l) == 0L)
                        break;
  -                  if (kind > 115)
  -                     kind = 115;
  -                  jjCheckNAdd(352);
  +                  if (kind > 6)
  +                     kind = 6;
  +                  jjCheckNAddTwoStates(41, 43);
                     break;
  -               case 353:
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(353, 354);
  +               case 42:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 38;
                     break;
  -               case 354:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 355;
  +               case 44:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 40;
                     break;
  -               case 356:
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                     jjCheckNAddStates(102, 104);
  +               case 45:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 44;
                     break;
  -               case 357:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjCheckNAddTwoStates(357, 358);
  +               case 46:
  +                  if ((0x100002600L & l) == 0L)
  +                     break;
  +                  if (kind > 6)
  +                     kind = 6;
  +                  jjCheckNAddStates(442, 444);
                     break;
  -               case 358:
  -                  if (curChar == 40 && kind > 118)
  -                     kind = 118;
  +               case 47:
  +                  if ((0x100002600L & l) == 0L)
  +                     break;
  +                  if (kind > 8)
  +                     kind = 8;
  +                  jjCheckNAdd(47);
                     break;
  -               case 361:
  +               case 50:
                     if ((0x100002600L & l) != 0L)
  -                     jjAddStates(173, 174);
  +                     jjAddStates(451, 453);
                     break;
  -               case 368:
  -                  if ((0x100002600L & l) != 0L)
  -                     jjAddStates(175, 176);
  +               case 51:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(52, 59);
                     break;
  -               case 369:
  -                  if (curChar == 40 && kind > 102)
  -                     kind = 102;
  +               case 52:
  +                  jjCheckNAddTwoStates(52, 59);
                     break;
  -               case 372:
  -                  if ((0x3ff000000000000L & l) == 0L)
  -                     break;
  -                  if (kind > 91)
  -                     kind = 91;
  -                  jjCheckNAddStates(105, 110);
  +               case 54:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 51;
                     break;
  -               case 373:
  -                  if ((0x3ff000000000000L & l) == 0L)
  -                     break;
  -                  if (kind > 91)
  -                     kind = 91;
  -                  jjCheckNAdd(373);
  +               case 56:
  +                  if (curChar == 58 && kind > 9)
  +                     kind = 9;
                     break;
  -               case 374:
  -                  if ((0x3ff000000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(374, 375);
  +               case 57:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 56;
                     break;
  -               case 375:
  -                  if (curChar != 46)
  -                     break;
  -                  if (kind > 92)
  -                     kind = 92;
  -                  jjCheckNAdd(376);
  +               case 58:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 53;
                     break;
  -               case 376:
  -                  if ((0x3ff000000000000L & l) == 0L)
  -                     break;
  -                  if (kind > 92)
  -                     kind = 92;
  -                  jjCheckNAdd(376);
  +               case 59:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 58;
                     break;
  -               case 377:
  -                  if ((0x3ff000000000000L & l) != 0L)
  -                     jjCheckNAddStates(177, 179);
  +               case 64:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(454, 456);
                     break;
  -               case 378:
  -                  if (curChar == 46)
  -                     jjCheckNAddTwoStates(379, 380);
  +               case 65:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(66, 72);
                     break;
  -               case 379:
  -                  if ((0x3ff000000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(379, 380);
  +               case 66:
  +                  jjCheckNAddTwoStates(66, 72);
                     break;
  -               case 381:
  -                  if ((0x280000000000L & l) != 0L)
  -                     jjCheckNAdd(382);
  +               case 68:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 65;
                     break;
  -               case 382:
  -                  if ((0x3ff000000000000L & l) == 0L)
  -                     break;
  -                  if (kind > 93)
  -                     kind = 93;
  -                  jjCheckNAdd(382);
  +               case 70:
  +                  if (curChar == 40 && kind > 104)
  +                     kind = 104;
                     break;
  -               case 383:
  -                  if (curChar == 46)
  -                     jjCheckNAddTwoStates(384, 385);
  +               case 71:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 67;
                     break;
  -               case 384:
  -                  if ((0x3ff000000000000L & l) == 0L)
  -                     break;
  -                  if (kind > 92)
  -                     kind = 92;
  -                  jjCheckNAdd(384);
  +               case 72:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 71;
                     break;
  -               case 385:
  -                  if ((0x3ff000000000000L & l) != 0L)
  -                     jjCheckNAddTwoStates(385, 380);
  +               case 80:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(457, 459);
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      else if (curChar < 128)
  -      {
  -         long l = 1L << (curChar & 077);
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 330:
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddStates(102, 104);
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(353, 354);
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                  {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(352);
  -                  }
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(349, 350);
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(346, 347);
  -                  if (curChar == 118)
  -                     jjstateSet[jjnewStateCnt++] = 343;
  -                  else if (curChar == 108)
  -                     jjstateSet[jjnewStateCnt++] = 337;
  -                  if (curChar == 108)
  -                     jjstateSet[jjnewStateCnt++] = 329;
  +               case 81:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(82, 89);
                     break;
  -               case 6:
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                  {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAddStates(180, 189);
  -                  }
  -                  else if (curChar == 123)
  -                     jjstateSet[jjnewStateCnt++] = 5;
  -                  if (curChar == 116)
  -                     jjAddStates(190, 191);
  -                  else if (curChar == 101)
  -                     jjAddStates(192, 194);
  -                  else if (curChar == 110)
  -                     jjAddStates(195, 196);
  -                  else if (curChar == 102)
  -                     jjAddStates(197, 199);
  -                  else if (curChar == 115)
  -                     jjAddStates(200, 201);
  -                  else if (curChar == 97)
  -                     jjAddStates(202, 206);
  -                  else if (curChar == 112)
  -                     jjAddStates(207, 210);
  -                  else if (curChar == 100)
  -                     jjAddStates(211, 215);
  -                  else if (curChar == 99)
  -                     jjAddStates(216, 218);
  -                  else if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 18;
  -                  else if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 7;
  +               case 82:
  +                  jjCheckNAddTwoStates(82, 89);
                     break;
  -               case 386:
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddStates(102, 104);
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(353, 354);
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                  {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(352);
  -                  }
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(349, 350);
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(346, 347);
  +               case 84:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 81;
                     break;
  -               case 1:
  -                  if ((0xdfffffffffffffffL & l) != 0L)
  -                     jjAddStates(65, 66);
  +               case 86:
  +                  if (curChar == 58 && kind > 10)
  +                     kind = 10;
                     break;
  -               case 2:
  -                  if (curChar == 125 && kind > 1)
  -                     kind = 1;
  +               case 87:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 86;
                     break;
  -               case 7:
  -                  if (curChar == 102)
  -                     jjstateSet[jjnewStateCnt++] = 8;
  +               case 88:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 83;
                     break;
  -               case 9:
  -                  if (curChar == 101 && kind > 45)
  -                     kind = 45;
  +               case 89:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 88;
                     break;
  -               case 10:
  -                  if (curChar == 112)
  -                     jjstateSet[jjnewStateCnt++] = 9;
  +               case 99:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(460, 462);
                     break;
  -               case 11:
  -                  if (curChar == 121)
  -                     jjstateSet[jjnewStateCnt++] = 10;
  +               case 100:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(101, 108);
                     break;
  -               case 12:
  -                  if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 11;
  +               case 101:
  +                  jjCheckNAddTwoStates(101, 108);
                     break;
  -               case 13:
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 7;
  +               case 103:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 100;
                     break;
  -               case 16:
  -               case 17:
  -                  if ((0x7fffffe87fffffeL & l) == 0L)
  -                     break;
  -                  if (kind > 54)
  -                     kind = 54;
  -                  jjCheckNAdd(17);
  +               case 105:
  +                  if (curChar == 58 && kind > 14)
  +                     kind = 14;
                     break;
  -               case 18:
  -                  if (curChar == 102)
  -                     jjAddStates(113, 114);
  +               case 106:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 105;
                     break;
  -               case 21:
  -                  if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 18;
  +               case 107:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 102;
                     break;
  -               case 23:
  -                  jjAddStates(75, 76);
  +               case 108:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 107;
                     break;
  -               case 26:
  -                  jjAddStates(219, 220);
  +               case 112:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 111;
                     break;
  -               case 31:
  -                  if (curChar == 99)
  -                     jjAddStates(216, 218);
  +               case 115:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 114;
                     break;
  -               case 32:
  -                  if (curChar == 100)
  -                     jjAddStates(115, 116);
  +               case 127:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(463, 465);
                     break;
  -               case 36:
  -                  if (curChar == 108)
  -                     jjstateSet[jjnewStateCnt++] = 32;
  +               case 128:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(129, 136);
                     break;
  -               case 37:
  -                  if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 36;
  +               case 129:
  +                  jjCheckNAddTwoStates(129, 136);
                     break;
  -               case 38:
  -                  if (curChar == 104)
  -                     jjstateSet[jjnewStateCnt++] = 37;
  +               case 131:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 128;
                     break;
  -               case 39:
  -                  if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 40;
  +               case 133:
  +                  if (curChar == 58 && kind > 11)
  +                     kind = 11;
                     break;
  -               case 41:
  -                  if (curChar == 115 && kind > 87)
  -                     kind = 87;
  +               case 134:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 133;
                     break;
  -               case 42:
  -                  if (curChar == 97)
  -                     jjstateSet[jjnewStateCnt++] = 41;
  +               case 135:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 130;
                     break;
  -               case 43:
  -                  if (curChar == 115)
  -                     jjstateSet[jjnewStateCnt++] = 39;
  +               case 136:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 135;
                     break;
  -               case 44:
  -                  if (curChar == 97)
  -                     jjstateSet[jjnewStateCnt++] = 43;
  +               case 142:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(466, 468);
                     break;
  -               case 45:
  -                  if (curChar == 116)
  -                     jjAddStates(119, 120);
  +               case 143:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(144, 151);
                     break;
  -               case 48:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 45;
  +               case 144:
  +                  jjCheckNAddTwoStates(144, 151);
                     break;
  -               case 49:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 48;
  +               case 146:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 143;
                     break;
  -               case 50:
  -                  if (curChar == 109)
  -                     jjstateSet[jjnewStateCnt++] = 49;
  +               case 148:
  +                  if (curChar == 58 && kind > 17)
  +                     kind = 17;
                     break;
  -               case 51:
  -                  if (curChar == 109)
  -                     jjstateSet[jjnewStateCnt++] = 50;
  +               case 149:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 148;
                     break;
  -               case 52:
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 51;
  +               case 150:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 145;
                     break;
  -               case 53:
  -                  if (curChar == 100)
  -                     jjAddStates(211, 215);
  +               case 151:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 150;
                     break;
  -               case 54:
  -                  if (curChar == 116)
  -                     jjAddStates(121, 122);
  +               case 158:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 157;
                     break;
  -               case 58:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 54;
  +               case 168:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(469, 471);
                     break;
  -               case 59:
  -                  if (curChar == 97)
  -                     jjstateSet[jjnewStateCnt++] = 58;
  +               case 169:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(170, 177);
                     break;
  -               case 60:
  -                  if (curChar == 100)
  -                     jjstateSet[jjnewStateCnt++] = 59;
  +               case 170:
  +                  jjCheckNAddTwoStates(170, 177);
                     break;
  -               case 61:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 60;
  +               case 172:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 169;
                     break;
  -               case 62:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 61;
  +               case 174:
  +                  if (curChar == 58 && kind > 19)
  +                     kind = 19;
                     break;
  -               case 63:
  -                  if (curChar == 99)
  -                     jjstateSet[jjnewStateCnt++] = 62;
  +               case 175:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 174;
                     break;
  -               case 64:
  -                  if (curChar == 115)
  -                     jjstateSet[jjnewStateCnt++] = 63;
  +               case 176:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 171;
                     break;
  -               case 65:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 64;
  +               case 177:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 176;
  +                  break;
  +               case 186:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(472, 474);
  +                  break;
  +               case 187:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(188, 194);
  +                  break;
  +               case 188:
  +                  jjCheckNAddTwoStates(188, 194);
  +                  break;
  +               case 190:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 187;
  +                  break;
  +               case 192:
  +                  if (curChar == 40 && kind > 106)
  +                     kind = 106;
  +                  break;
  +               case 193:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 189;
  +                  break;
  +               case 194:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 193;
                     break;
  -               case 66:
  -                  if (curChar == 102)
  -                     jjAddStates(123, 124);
  +               case 205:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 204;
                     break;
  -               case 70:
  -                  if (curChar == 108)
  -                     jjstateSet[jjnewStateCnt++] = 66;
  +               case 217:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(475, 477);
                     break;
  -               case 71:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 70;
  +               case 218:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(219, 226);
                     break;
  -               case 72:
  -                  if (curChar == 115)
  -                     jjstateSet[jjnewStateCnt++] = 71;
  +               case 219:
  +                  jjCheckNAddTwoStates(219, 226);
                     break;
  -               case 74:
  -                  if (curChar == 114)
  -                     jjstateSet[jjnewStateCnt++] = 73;
  +               case 221:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 218;
                     break;
  -               case 75:
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 74;
  +               case 223:
  +                  if (curChar == 58 && kind > 12)
  +                     kind = 12;
                     break;
  -               case 77:
  -                  if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 76;
  +               case 224:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 223;
                     break;
  -               case 78:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 77;
  +               case 225:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 220;
                     break;
  -               case 79:
  -                  if (curChar == 97)
  -                     jjstateSet[jjnewStateCnt++] = 78;
  +               case 226:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 225;
                     break;
  -               case 80:
  -                  if (curChar == 100)
  -                     jjstateSet[jjnewStateCnt++] = 79;
  +               case 235:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(478, 480);
                     break;
  -               case 81:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 80;
  +               case 236:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(237, 244);
                     break;
  -               case 82:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 81;
  +               case 237:
  +                  jjCheckNAddTwoStates(237, 244);
                     break;
  -               case 83:
  -                  if (curChar == 99)
  -                     jjstateSet[jjnewStateCnt++] = 82;
  +               case 239:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 236;
                     break;
  -               case 84:
  -                  if (curChar == 115)
  -                     jjstateSet[jjnewStateCnt++] = 83;
  +               case 241:
  +                  if (curChar == 58 && kind > 15)
  +                     kind = 15;
                     break;
  -               case 85:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 84;
  +               case 242:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 241;
                     break;
  -               case 86:
  -                  if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 87;
  +               case 243:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 238;
                     break;
  -               case 88:
  -                  if (curChar == 116 && kind > 43)
  -                     kind = 43;
  +               case 244:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 243;
                     break;
  -               case 89:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 88;
  +               case 252:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(481, 483);
                     break;
  -               case 90:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 89;
  +               case 253:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(254, 261);
                     break;
  -               case 91:
  -                  if (curChar == 109)
  -                     jjstateSet[jjnewStateCnt++] = 90;
  +               case 254:
  +                  jjCheckNAddTwoStates(254, 261);
                     break;
  -               case 92:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 91;
  +               case 256:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 253;
                     break;
  -               case 93:
  -                  if (curChar == 108)
  -                     jjstateSet[jjnewStateCnt++] = 92;
  +               case 258:
  +                  if (curChar == 58 && kind > 21)
  +                     kind = 21;
                     break;
  -               case 94:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 93;
  +               case 259:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 258;
                     break;
  -               case 95:
  -                  if (curChar == 108)
  -                     jjstateSet[jjnewStateCnt++] = 86;
  +               case 260:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 255;
                     break;
  -               case 96:
  -                  if (curChar == 117)
  -                     jjstateSet[jjnewStateCnt++] = 95;
  +               case 261:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 260;
                     break;
  -               case 97:
  -                  if (curChar == 97)
  -                     jjstateSet[jjnewStateCnt++] = 96;
  +               case 265:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 264;
                     break;
  -               case 98:
  -                  if (curChar == 102)
  -                     jjstateSet[jjnewStateCnt++] = 97;
  +               case 268:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 267;
                     break;
  -               case 99:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 98;
  +               case 278:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(484, 486);
                     break;
  -               case 100:
  -                  if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 101;
  +               case 279:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(280, 287);
                     break;
  -               case 102:
  -                  if (curChar == 110 && kind > 44)
  -                     kind = 44;
  +               case 280:
  +                  jjCheckNAddTwoStates(280, 287);
                     break;
  -               case 103:
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 102;
  +               case 282:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 279;
                     break;
  -               case 104:
  -                  if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 103;
  +               case 284:
  +                  if (curChar == 58 && kind > 16)
  +                     kind = 16;
                     break;
  -               case 105:
  -                  if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 104;
  +               case 285:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 284;
                     break;
  -               case 106:
  -                  if (curChar == 99)
  -                     jjstateSet[jjnewStateCnt++] = 105;
  +               case 286:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 281;
                     break;
  -               case 107:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 106;
  +               case 287:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 286;
                     break;
  -               case 108:
  -                  if (curChar == 117)
  -                     jjstateSet[jjnewStateCnt++] = 107;
  +               case 294:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 293;
                     break;
  -               case 109:
  -                  if (curChar == 102)
  -                     jjstateSet[jjnewStateCnt++] = 108;
  +               case 304:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(487, 489);
                     break;
  -               case 110:
  -                  if (curChar == 108)
  -                     jjstateSet[jjnewStateCnt++] = 100;
  +               case 305:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(306, 313);
                     break;
  -               case 111:
  -                  if (curChar == 117)
  -                     jjstateSet[jjnewStateCnt++] = 110;
  +               case 306:
  +                  jjCheckNAddTwoStates(306, 313);
                     break;
  -               case 112:
  -                  if (curChar == 97)
  -                     jjstateSet[jjnewStateCnt++] = 111;
  +               case 308:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 305;
                     break;
  -               case 113:
  -                  if (curChar == 102)
  -                     jjstateSet[jjnewStateCnt++] = 112;
  +               case 310:
  +                  if (curChar == 58 && kind > 18)
  +                     kind = 18;
                     break;
  -               case 114:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 113;
  +               case 311:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 310;
                     break;
  -               case 115:
  -                  if (curChar == 116)
  -                     jjAddStates(129, 130);
  +               case 312:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 307;
                     break;
  -               case 117:
  -                  if (curChar == 123 && kind > 96)
  -                     kind = 96;
  +               case 313:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 312;
                     break;
  -               case 118:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 115;
  +               case 323:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(490, 492);
                     break;
  -               case 119:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 118;
  +               case 324:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(325, 332);
                     break;
  -               case 120:
  -                  if (curChar == 109)
  -                     jjstateSet[jjnewStateCnt++] = 119;
  +               case 325:
  +                  jjCheckNAddTwoStates(325, 332);
                     break;
  -               case 121:
  -                  if (curChar == 117)
  -                     jjstateSet[jjnewStateCnt++] = 120;
  +               case 327:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 324;
                     break;
  -               case 122:
  -                  if (curChar == 99)
  -                     jjstateSet[jjnewStateCnt++] = 121;
  +               case 329:
  +                  if (curChar == 58 && kind > 20)
  +                     kind = 20;
                     break;
  -               case 123:
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 122;
  +               case 330:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 329;
                     break;
  -               case 124:
  -                  if (curChar == 112)
  -                     jjAddStates(207, 210);
  +               case 331:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 326;
                     break;
  -               case 125:
  -                  if (curChar == 116)
  -                     jjAddStates(131, 132);
  +               case 332:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 331;
                     break;
  -               case 129:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 125;
  +               case 341:
  +                  if ((0x100002600L & l) != 0L)
  +                     jjAddStates(493, 495);
                     break;
  -               case 130:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 129;
  +               case 342:
  +                  if (curChar == 45)
  +                     jjCheckNAddTwoStates(343, 349);
                     break;
  -               case 131:
  -                  if (curChar == 114)
  -                     jjstateSet[jjnewStateCnt++] = 130;
  +               case 343:
  +                  jjCheckNAddTwoStates(343, 349);
                     break;
  -               case 132:
  -                  if (curChar == 97)
  -                     jjstateSet[jjnewStateCnt++] = 131;
  +               case 345:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 342;
                     break;
  -               case 133:
  -                  if (curChar == 103)
  -                     jjAddStates(133, 134);
  +               case 347:
  +                  if (curChar == 40 && kind > 103)
  +                     kind = 103;
                     break;
  -               case 137:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 133;
  +               case 348:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 344;
                     break;
  -               case 138:
  -                  if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 137;
  +               case 349:
  +                  if (curChar == 45)
  +                     jjstateSet[jjnewStateCnt++] = 348;
                     break;
  -               case 139:
  -                  if (curChar == 108)
  -                     jjstateSet[jjnewStateCnt++] = 138;
  +               case 353:
  +                  if ((0x3ff600000000000L & l) != 0L)
  +                     jjAddStates(496, 497);
                     break;
  -               case 140:
  -                  if (curChar == 98)
  -                     jjstateSet[jjnewStateCnt++] = 139;
  +               case 354:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 355;
                     break;
  -               case 141:
  -                  if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 140;
  +               case 355:
  +                  if (curChar == 42 && kind > 58)
  +                     kind = 58;
                     break;
  -               case 142:
  -                  if (curChar == 115)
  -                     jjstateSet[jjnewStateCnt++] = 141;
  +               case 356:
  +                  if ((0x3ff600000000000L & l) != 0L)
  +                     jjAddStates(498, 499);
                     break;
  -               case 144:
  -                  if (curChar == 103)
  -                     jjstateSet[jjnewStateCnt++] = 143;
  +               case 357:
  +                  if (curChar == 58)
  +                     jjstateSet[jjnewStateCnt++] = 358;
                     break;
  -               case 145:
  +               case 359:
  +                  if ((0x3ff600000000000L & l) == 0L)
  +                     break;
  +                  if (kind > 116)
  +                     kind = 116;
  +                  jjstateSet[jjnewStateCnt++] = 359;
  +                  break;
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      else if (curChar < 128)
  +      {
  +         long l = 1L << (curChar & 077);
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 13:
  +                  if ((0x7fffffe87fffffeL & l) != 0L)
  +                  {
  +                     if (kind > 116)
  +                        kind = 116;
  +                     jjCheckNAddStates(500, 504);
  +                  }
  +                  else if (curChar == 123)
  +                     jjCheckNAddTwoStates(37, 42);
                     if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 144;
  +                     jjAddStates(505, 506);
  +                  else if (curChar == 102)
  +                     jjAddStates(507, 508);
  +                  else if (curChar == 97)
  +                     jjAddStates(509, 511);
  +                  else if (curChar == 112)
  +                     jjAddStates(512, 515);
  +                  else if (curChar == 100)
  +                     jjAddStates(516, 517);
  +                  else if (curChar == 99)
  +                     jjAddStates(518, 519);
  +                  else if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 29;
  +                  else if (curChar == 115)
  +                     jjstateSet[jjnewStateCnt++] = 12;
                     break;
  -               case 146:
  -                  if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 145;
  +               case 0:
  +                  if (curChar == 102)
  +                     jjCheckNAddStates(445, 447);
                     break;
  -               case 147:
  -                  if (curChar == 100)
  -                     jjstateSet[jjnewStateCnt++] = 146;
  +               case 3:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(520, 521);
                     break;
  -               case 148:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 147;
  +               case 4:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(445, 447);
                     break;
  -               case 149:
  -                  if (curChar == 99)
  -                     jjstateSet[jjnewStateCnt++] = 148;
  +               case 6:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 5;
                     break;
  -               case 150:
  +               case 11:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 0;
  +                  break;
  +               case 12:
                     if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 149;
  +                     jjstateSet[jjnewStateCnt++] = 11;
                     break;
  -               case 151:
  -                  if (curChar == 114)
  -                     jjstateSet[jjnewStateCnt++] = 150;
  +               case 16:
  +               case 17:
  +                  if ((0x7fffffe87fffffeL & l) == 0L)
  +                     break;
  +                  if (kind > 59)
  +                     kind = 59;
  +                  jjCheckNAdd(17);
                     break;
  -               case 152:
  -                  if (curChar == 103)
  -                     jjAddStates(135, 136);
  +               case 18:
  +                  if (curChar == 116)
  +                     jjCheckNAddStates(448, 450);
                     break;
  -               case 156:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 152;
  +               case 21:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(522, 523);
                     break;
  -               case 157:
  -                  if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 156;
  +               case 22:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(448, 450);
                     break;
  -               case 158:
  -                  if (curChar == 100)
  -                     jjstateSet[jjnewStateCnt++] = 157;
  +               case 24:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 23;
                     break;
  -               case 159:
  +               case 28:
  +                  if (curChar == 120)
  +                     jjstateSet[jjnewStateCnt++] = 18;
  +                  break;
  +               case 29:
                     if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 158;
  +                     jjstateSet[jjnewStateCnt++] = 28;
                     break;
  -               case 160:
  -                  if (curChar == 99)
  -                     jjstateSet[jjnewStateCnt++] = 159;
  +               case 30:
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 29;
                     break;
  -               case 161:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 160;
  +               case 31:
  +                  if (curChar == 123)
  +                     jjCheckNAddTwoStates(37, 42);
                     break;
  -               case 162:
  -                  if (curChar == 114)
  -                     jjstateSet[jjnewStateCnt++] = 161;
  +               case 33:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(524, 525);
                     break;
  -               case 163:
  -                  if (curChar == 110)
  -                     jjAddStates(137, 138);
  +               case 34:
  +                  if (curChar == 125 && kind > 5)
  +                     kind = 5;
                     break;
  -               case 166:
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 163;
  +               case 39:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(526, 527);
                     break;
  -               case 167:
  -                  if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 166;
  +               case 40:
  +                  if (curChar != 125)
  +                     break;
  +                  if (kind > 6)
  +                     kind = 6;
  +                  jjAddStates(528, 529);
                     break;
  -               case 168:
  -                  if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 167;
  +               case 43:
  +                  if (curChar == 123)
  +                     jjCheckNAdd(42);
                     break;
  -               case 169:
  +               case 48:
                     if (curChar == 99)
  -                     jjstateSet[jjnewStateCnt++] = 168;
  +                     jjAddStates(518, 519);
                     break;
  -               case 170:
  -                  if (curChar == 117)
  -                     jjstateSet[jjnewStateCnt++] = 169;
  +               case 49:
  +                  if (curChar == 100)
  +                     jjCheckNAddStates(451, 453);
                     break;
  -               case 171:
  -                  if (curChar == 114)
  -                     jjstateSet[jjnewStateCnt++] = 170;
  +               case 52:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(530, 531);
                     break;
  -               case 172:
  -                  if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 171;
  +               case 53:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(451, 453);
                     break;
  -               case 173:
  -                  if (curChar == 115)
  -                     jjstateSet[jjnewStateCnt++] = 172;
  +               case 55:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 54;
                     break;
  -               case 174:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 173;
  +               case 60:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 49;
                     break;
  -               case 175:
  +               case 61:
                     if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 174;
  +                     jjstateSet[jjnewStateCnt++] = 60;
                     break;
  -               case 177:
  -                  if (curChar == 103)
  -                     jjstateSet[jjnewStateCnt++] = 176;
  +               case 62:
  +                  if (curChar == 104)
  +                     jjstateSet[jjnewStateCnt++] = 61;
                     break;
  -               case 178:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 177;
  +               case 63:
  +                  if (curChar == 116)
  +                     jjCheckNAddStates(454, 456);
                     break;
  -               case 179:
  -                  if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 178;
  +               case 66:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(532, 533);
                     break;
  -               case 180:
  -                  if (curChar == 115)
  -                     jjstateSet[jjnewStateCnt++] = 179;
  +               case 67:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(454, 456);
  +                  break;
  +               case 69:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 68;
                     break;
  -               case 181:
  -                  if (curChar == 115)
  -                     jjstateSet[jjnewStateCnt++] = 180;
  +               case 73:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 63;
                     break;
  -               case 182:
  +               case 74:
                     if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 181;
  -                  break;
  -               case 183:
  -                  if (curChar == 99)
  -                     jjstateSet[jjnewStateCnt++] = 182;
  +                     jjstateSet[jjnewStateCnt++] = 73;
                     break;
  -               case 184:
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 183;
  +               case 75:
  +                  if (curChar == 109)
  +                     jjstateSet[jjnewStateCnt++] = 74;
                     break;
  -               case 185:
  -                  if (curChar == 114)
  -                     jjstateSet[jjnewStateCnt++] = 184;
  +               case 76:
  +                  if (curChar == 109)
  +                     jjstateSet[jjnewStateCnt++] = 75;
                     break;
  -               case 186:
  -                  if (curChar == 97)
  -                     jjAddStates(202, 206);
  +               case 77:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 76;
                     break;
  -               case 187:
  -                  if (curChar == 101)
  -                     jjAddStates(139, 140);
  +               case 78:
  +                  if (curChar == 100)
  +                     jjAddStates(516, 517);
                     break;
  -               case 191:
  +               case 79:
                     if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 187;
  +                     jjCheckNAddStates(457, 459);
                     break;
  -               case 192:
  -                  if (curChar == 117)
  -                     jjstateSet[jjnewStateCnt++] = 191;
  +               case 82:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(534, 535);
                     break;
  -               case 193:
  -                  if (curChar == 98)
  -                     jjstateSet[jjnewStateCnt++] = 192;
  +               case 83:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(457, 459);
                     break;
  -               case 194:
  -                  if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 193;
  +               case 85:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 84;
                     break;
  -               case 195:
  -                  if (curChar == 114)
  -                     jjstateSet[jjnewStateCnt++] = 194;
  +               case 90:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 79;
                     break;
  -               case 196:
  -                  if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 195;
  +               case 91:
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 90;
                     break;
  -               case 197:
  -                  if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 196;
  +               case 92:
  +                  if (curChar == 100)
  +                     jjstateSet[jjnewStateCnt++] = 91;
                     break;
  -               case 198:
  -                  if (curChar == 114)
  -                     jjAddStates(141, 142);
  +               case 93:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 92;
                     break;
  -               case 202:
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 198;
  +               case 94:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 93;
                     break;
  -               case 203:
  -                  if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 202;
  +               case 95:
  +                  if (curChar == 99)
  +                     jjstateSet[jjnewStateCnt++] = 94;
                     break;
  -               case 204:
  +               case 96:
                     if (curChar == 115)
  -                     jjstateSet[jjnewStateCnt++] = 203;
  +                     jjstateSet[jjnewStateCnt++] = 95;
                     break;
  -               case 205:
  +               case 97:
                     if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 204;
  +                     jjstateSet[jjnewStateCnt++] = 96;
                     break;
  -               case 206:
  -                  if (curChar == 99)
  -                     jjstateSet[jjnewStateCnt++] = 205;
  +               case 98:
  +                  if (curChar == 102)
  +                     jjCheckNAddStates(460, 462);
                     break;
  -               case 207:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 206;
  +               case 101:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(536, 537);
                     break;
  -               case 208:
  -                  if (curChar == 102)
  -                     jjAddStates(143, 144);
  +               case 102:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(460, 462);
                     break;
  -               case 212:
  +               case 104:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 103;
  +                  break;
  +               case 109:
                     if (curChar == 108)
  -                     jjstateSet[jjnewStateCnt++] = 208;
  +                     jjstateSet[jjnewStateCnt++] = 98;
                     break;
  -               case 213:
  +               case 110:
                     if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 212;
  +                     jjstateSet[jjnewStateCnt++] = 109;
                     break;
  -               case 214:
  +               case 111:
                     if (curChar == 115)
  -                     jjstateSet[jjnewStateCnt++] = 213;
  -                  break;
  -               case 216:
  -                  if (curChar == 114)
  -                     jjstateSet[jjnewStateCnt++] = 215;
  -                  break;
  -               case 217:
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 216;
  +                     jjstateSet[jjnewStateCnt++] = 110;
                     break;
  -               case 219:
  +               case 113:
                     if (curChar == 114)
  -                     jjstateSet[jjnewStateCnt++] = 218;
  +                     jjstateSet[jjnewStateCnt++] = 112;
                     break;
  -               case 220:
  +               case 114:
                     if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 219;
  +                     jjstateSet[jjnewStateCnt++] = 113;
                     break;
  -               case 221:
  +               case 116:
                     if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 220;
  +                     jjstateSet[jjnewStateCnt++] = 115;
                     break;
  -               case 222:
  -                  if (curChar == 115)
  -                     jjstateSet[jjnewStateCnt++] = 221;
  +               case 117:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 116;
                     break;
  -               case 223:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 222;
  +               case 118:
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 117;
                     break;
  -               case 224:
  -                  if (curChar == 99)
  -                     jjstateSet[jjnewStateCnt++] = 223;
  +               case 119:
  +                  if (curChar == 100)
  +                     jjstateSet[jjnewStateCnt++] = 118;
                     break;
  -               case 225:
  +               case 120:
                     if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 224;
  +                     jjstateSet[jjnewStateCnt++] = 119;
                     break;
  -               case 226:
  +               case 121:
                     if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 227;
  +                     jjstateSet[jjnewStateCnt++] = 120;
                     break;
  -               case 228:
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddStates(221, 224);
  +               case 122:
  +                  if (curChar == 99)
  +                     jjstateSet[jjnewStateCnt++] = 121;
                     break;
  -               case 229:
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(229, 230);
  +               case 123:
  +                  if (curChar == 115)
  +                     jjstateSet[jjnewStateCnt++] = 122;
                     break;
  -               case 231:
  -               case 232:
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(232, 233);
  +               case 124:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 123;
                     break;
  -               case 234:
  -                  if (curChar == 123 && kind > 40)
  -                     kind = 40;
  +               case 125:
  +                  if (curChar == 112)
  +                     jjAddStates(512, 515);
                     break;
  -               case 235:
  +               case 126:
                     if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 226;
  +                     jjCheckNAddStates(463, 465);
                     break;
  -               case 236:
  -                  if (curChar == 117)
  -                     jjstateSet[jjnewStateCnt++] = 235;
  +               case 129:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(538, 539);
                     break;
  -               case 237:
  -                  if (curChar == 98)
  -                     jjstateSet[jjnewStateCnt++] = 236;
  +               case 130:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(463, 465);
                     break;
  -               case 238:
  -                  if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 237;
  +               case 132:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 131;
                     break;
  -               case 239:
  +               case 137:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 126;
  +                  break;
  +               case 138:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 137;
  +                  break;
  +               case 139:
                     if (curChar == 114)
  -                     jjstateSet[jjnewStateCnt++] = 238;
  +                     jjstateSet[jjnewStateCnt++] = 138;
                     break;
  -               case 240:
  -                  if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 239;
  +               case 140:
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 139;
                     break;
  -               case 241:
  -                  if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 240;
  +               case 141:
  +                  if (curChar == 103)
  +                     jjCheckNAddStates(466, 468);
                     break;
  -               case 242:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 243;
  +               case 144:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(540, 541);
                     break;
  -               case 244:
  -                  if (curChar == 123 && kind > 42)
  -                     kind = 42;
  +               case 145:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(466, 468);
                     break;
  -               case 245:
  -                  if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 242;
  +               case 147:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 146;
                     break;
  -               case 246:
  -                  if (curChar == 117)
  -                     jjstateSet[jjnewStateCnt++] = 245;
  +               case 152:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 141;
  +                  break;
  +               case 153:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 152;
  +                  break;
  +               case 154:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 153;
                     break;
  -               case 247:
  +               case 155:
                     if (curChar == 98)
  -                     jjstateSet[jjnewStateCnt++] = 246;
  +                     jjstateSet[jjnewStateCnt++] = 154;
                     break;
  -               case 248:
  +               case 156:
                     if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 247;
  -                  break;
  -               case 249:
  -                  if (curChar == 114)
  -                     jjstateSet[jjnewStateCnt++] = 248;
  +                     jjstateSet[jjnewStateCnt++] = 155;
                     break;
  -               case 250:
  -                  if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 249;
  +               case 157:
  +                  if (curChar == 115)
  +                     jjstateSet[jjnewStateCnt++] = 156;
                     break;
  -               case 251:
  -                  if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 250;
  +               case 159:
  +                  if (curChar == 103)
  +                     jjstateSet[jjnewStateCnt++] = 158;
                     break;
  -               case 252:
  -                  if (curChar == 115)
  -                     jjAddStates(200, 201);
  +               case 160:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 159;
                     break;
  -               case 253:
  -                  if (curChar == 102)
  -                     jjAddStates(151, 152);
  +               case 161:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 160;
                     break;
  -               case 257:
  -                  if (curChar == 108)
  -                     jjstateSet[jjnewStateCnt++] = 253;
  +               case 162:
  +                  if (curChar == 100)
  +                     jjstateSet[jjnewStateCnt++] = 161;
                     break;
  -               case 258:
  +               case 163:
                     if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 257;
  +                     jjstateSet[jjnewStateCnt++] = 162;
                     break;
  -               case 259:
  +               case 164:
  +                  if (curChar == 99)
  +                     jjstateSet[jjnewStateCnt++] = 163;
  +                  break;
  +               case 165:
                     if (curChar == 101)
  -                     jjAddStates(153, 154);
  +                     jjstateSet[jjnewStateCnt++] = 164;
                     break;
  -               case 262:
  -                  if (curChar == 109)
  -                     jjstateSet[jjnewStateCnt++] = 259;
  +               case 166:
  +                  if (curChar == 114)
  +                     jjstateSet[jjnewStateCnt++] = 165;
                     break;
  -               case 263:
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 262;
  +               case 167:
  +                  if (curChar == 103)
  +                     jjCheckNAddStates(469, 471);
                     break;
  -               case 264:
  -                  if (curChar == 102)
  -                     jjAddStates(197, 199);
  +               case 170:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(542, 543);
                     break;
  -               case 265:
  -                  if (curChar == 103)
  -                     jjAddStates(155, 156);
  +               case 171:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(469, 471);
                     break;
  -               case 269:
  +               case 173:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 172;
  +                  break;
  +               case 178:
                     if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 265;
  +                     jjstateSet[jjnewStateCnt++] = 167;
                     break;
  -               case 270:
  +               case 179:
                     if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 269;
  +                     jjstateSet[jjnewStateCnt++] = 178;
                     break;
  -               case 271:
  -                  if (curChar == 108)
  -                     jjstateSet[jjnewStateCnt++] = 270;
  +               case 180:
  +                  if (curChar == 100)
  +                     jjstateSet[jjnewStateCnt++] = 179;
                     break;
  -               case 272:
  -                  if (curChar == 98)
  -                     jjstateSet[jjnewStateCnt++] = 271;
  +               case 181:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 180;
                     break;
  -               case 273:
  -                  if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 272;
  +               case 182:
  +                  if (curChar == 99)
  +                     jjstateSet[jjnewStateCnt++] = 181;
                     break;
  -               case 274:
  -                  if (curChar == 115)
  -                     jjstateSet[jjnewStateCnt++] = 273;
  +               case 183:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 182;
                     break;
  -               case 276:
  -                  if (curChar == 103)
  -                     jjstateSet[jjnewStateCnt++] = 275;
  +               case 184:
  +                  if (curChar == 114)
  +                     jjstateSet[jjnewStateCnt++] = 183;
                     break;
  -               case 277:
  +               case 185:
                     if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 276;
  +                     jjCheckNAddStates(472, 474);
                     break;
  -               case 278:
  -                  if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 277;
  +               case 188:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(544, 545);
                     break;
  -               case 279:
  -                  if (curChar == 119)
  -                     jjstateSet[jjnewStateCnt++] = 278;
  +               case 189:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(472, 474);
                     break;
  -               case 280:
  +               case 191:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 190;
  +                  break;
  +               case 195:
                     if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 279;
  +                     jjstateSet[jjnewStateCnt++] = 185;
                     break;
  -               case 281:
  -                  if (curChar == 108)
  -                     jjstateSet[jjnewStateCnt++] = 280;
  +               case 196:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 195;
                     break;
  -               case 282:
  -                  if (curChar == 108)
  -                     jjstateSet[jjnewStateCnt++] = 281;
  +               case 197:
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 196;
                     break;
  -               case 283:
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 282;
  +               case 198:
  +                  if (curChar == 99)
  +                     jjstateSet[jjnewStateCnt++] = 197;
                     break;
  -               case 284:
  -                  if (curChar == 103)
  -                     jjAddStates(157, 158);
  +               case 199:
  +                  if (curChar == 117)
  +                     jjstateSet[jjnewStateCnt++] = 198;
                     break;
  -               case 288:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 284;
  +               case 200:
  +                  if (curChar == 114)
  +                     jjstateSet[jjnewStateCnt++] = 199;
                     break;
  -               case 289:
  -                  if (curChar == 105)
  -                     jjstateSet[jjnewStateCnt++] = 288;
  +               case 201:
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 200;
                     break;
  -               case 290:
  -                  if (curChar == 119)
  -                     jjstateSet[jjnewStateCnt++] = 289;
  +               case 202:
  +                  if (curChar == 115)
  +                     jjstateSet[jjnewStateCnt++] = 201;
                     break;
  -               case 291:
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 290;
  +               case 203:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 202;
                     break;
  -               case 292:
  -                  if (curChar == 108)
  -                     jjstateSet[jjnewStateCnt++] = 291;
  +               case 204:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 203;
                     break;
  -               case 293:
  -                  if (curChar == 108)
  -                     jjstateSet[jjnewStateCnt++] = 292;
  +               case 206:
  +                  if (curChar == 103)
  +                     jjstateSet[jjnewStateCnt++] = 205;
                     break;
  -               case 294:
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 293;
  +               case 207:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 206;
                     break;
  -               case 295:
  -                  if (curChar == 114)
  -                     jjAddStates(159, 160);
  +               case 208:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 207;
                     break;
  -               case 298:
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 295;
  +               case 209:
  +                  if (curChar == 115)
  +                     jjstateSet[jjnewStateCnt++] = 208;
                     break;
  -               case 299:
  -                  if (curChar == 110)
  -                     jjAddStates(195, 196);
  +               case 210:
  +                  if (curChar == 115)
  +                     jjstateSet[jjnewStateCnt++] = 209;
                     break;
  -               case 300:
  +               case 211:
                     if (curChar == 101)
  -                     jjAddStates(161, 162);
  +                     jjstateSet[jjnewStateCnt++] = 210;
                     break;
  -               case 304:
  +               case 212:
                     if (curChar == 99)
  -                     jjstateSet[jjnewStateCnt++] = 300;
  +                     jjstateSet[jjnewStateCnt++] = 211;
                     break;
  -               case 305:
  -                  if (curChar == 97)
  -                     jjstateSet[jjnewStateCnt++] = 304;
  +               case 213:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 212;
                     break;
  -               case 306:
  -                  if (curChar == 112)
  -                     jjstateSet[jjnewStateCnt++] = 305;
  +               case 214:
  +                  if (curChar == 114)
  +                     jjstateSet[jjnewStateCnt++] = 213;
                     break;
  -               case 307:
  -                  if (curChar == 115)
  -                     jjstateSet[jjnewStateCnt++] = 306;
  +               case 215:
  +                  if (curChar == 97)
  +                     jjAddStates(509, 511);
                     break;
  -               case 308:
  +               case 216:
                     if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 307;
  +                     jjCheckNAddStates(475, 477);
                     break;
  -               case 309:
  -                  if (curChar == 109)
  -                     jjstateSet[jjnewStateCnt++] = 308;
  +               case 219:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(546, 547);
                     break;
  -               case 310:
  -                  if (curChar == 97)
  -                     jjstateSet[jjnewStateCnt++] = 309;
  +               case 220:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(475, 477);
  +                  break;
  +               case 222:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 221;
  +                  break;
  +               case 227:
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 216;
  +                  break;
  +               case 228:
  +                  if (curChar == 117)
  +                     jjstateSet[jjnewStateCnt++] = 227;
                     break;
  -               case 311:
  -                  if (curChar == 101)
  -                     jjAddStates(163, 164);
  +               case 229:
  +                  if (curChar == 98)
  +                     jjstateSet[jjnewStateCnt++] = 228;
                     break;
  -               case 314:
  -                  if (curChar == 100)
  -                     jjstateSet[jjnewStateCnt++] = 311;
  +               case 230:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 229;
                     break;
  -               case 315:
  -                  if (curChar == 111)
  -                     jjstateSet[jjnewStateCnt++] = 314;
  +               case 231:
  +                  if (curChar == 114)
  +                     jjstateSet[jjnewStateCnt++] = 230;
                     break;
  -               case 316:
  -                  if (curChar == 101)
  -                     jjAddStates(192, 194);
  +               case 232:
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 231;
                     break;
  -               case 317:
  +               case 233:
                     if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 318;
  +                     jjstateSet[jjnewStateCnt++] = 232;
                     break;
  -               case 319:
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddStates(225, 228);
  +               case 234:
  +                  if (curChar == 114)
  +                     jjCheckNAddStates(478, 480);
                     break;
  -               case 320:
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(320, 321);
  +               case 237:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(548, 549);
                     break;
  -               case 322:
  -               case 323:
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(323, 324);
  +               case 238:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(478, 480);
                     break;
  -               case 325:
  -                  if (curChar == 123 && kind > 39)
  -                     kind = 39;
  +               case 240:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 239;
                     break;
  -               case 326:
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 317;
  +               case 245:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 234;
                     break;
  -               case 327:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 326;
  +               case 246:
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 245;
                     break;
  -               case 328:
  -                  if (curChar == 109)
  -                     jjstateSet[jjnewStateCnt++] = 327;
  +               case 247:
  +                  if (curChar == 115)
  +                     jjstateSet[jjnewStateCnt++] = 246;
                     break;
  -               case 329:
  +               case 248:
                     if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 328;
  -                  break;
  -               case 331:
  -                  if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 332;
  +                     jjstateSet[jjnewStateCnt++] = 247;
                     break;
  -               case 333:
  -                  if (curChar == 123 && kind > 41)
  -                     kind = 41;
  +               case 249:
  +                  if (curChar == 99)
  +                     jjstateSet[jjnewStateCnt++] = 248;
                     break;
  -               case 334:
  +               case 250:
                     if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 331;
  -                  break;
  -               case 335:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 334;
  +                     jjstateSet[jjnewStateCnt++] = 249;
                     break;
  -               case 336:
  -                  if (curChar == 109)
  -                     jjstateSet[jjnewStateCnt++] = 335;
  +               case 251:
  +                  if (curChar == 102)
  +                     jjCheckNAddStates(481, 483);
                     break;
  -               case 337:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 336;
  +               case 254:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(550, 551);
                     break;
  -               case 338:
  -                  if (curChar == 108)
  -                     jjstateSet[jjnewStateCnt++] = 337;
  +               case 255:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(481, 483);
                     break;
  -               case 339:
  -                  if (curChar == 121)
  -                     jjAddStates(171, 172);
  +               case 257:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 256;
                     break;
  -               case 342:
  -                  if (curChar == 114)
  -                     jjstateSet[jjnewStateCnt++] = 339;
  +               case 262:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 251;
                     break;
  -               case 343:
  +               case 263:
                     if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 342;
  -                  break;
  -               case 344:
  -                  if (curChar == 118)
  -                     jjstateSet[jjnewStateCnt++] = 343;
  +                     jjstateSet[jjnewStateCnt++] = 262;
                     break;
  -               case 345:
  -                  if ((0x7fffffe87fffffeL & l) == 0L)
  -                     break;
  -                  if (kind > 115)
  -                     kind = 115;
  -                  jjCheckNAddStates(180, 189);
  +               case 264:
  +                  if (curChar == 115)
  +                     jjstateSet[jjnewStateCnt++] = 263;
                     break;
  -               case 346:
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(346, 347);
  +               case 266:
  +                  if (curChar == 114)
  +                     jjstateSet[jjnewStateCnt++] = 265;
                     break;
  -               case 349:
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(349, 350);
  +               case 267:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 266;
                     break;
  -               case 351:
  -                  if ((0x7fffffe87fffffeL & l) == 0L)
  -                     break;
  -                  if (kind > 115)
  -                     kind = 115;
  -                  jjCheckNAdd(352);
  +               case 269:
  +                  if (curChar == 114)
  +                     jjstateSet[jjnewStateCnt++] = 268;
                     break;
  -               case 352:
  -                  if ((0x7fffffe87fffffeL & l) == 0L)
  -                     break;
  -                  if (kind > 115)
  -                     kind = 115;
  -                  jjCheckNAdd(352);
  +               case 270:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 269;
                     break;
  -               case 353:
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(353, 354);
  +               case 271:
  +                  if (curChar == 116)
  +                     jjstateSet[jjnewStateCnt++] = 270;
                     break;
  -               case 355:
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddStates(102, 104);
  +               case 272:
  +                  if (curChar == 115)
  +                     jjstateSet[jjnewStateCnt++] = 271;
                     break;
  -               case 356:
  -                  if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddStates(102, 104);
  +               case 273:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 272;
                     break;
  -               case 359:
  -                  if (curChar == 116)
  -                     jjAddStates(190, 191);
  +               case 274:
  +                  if (curChar == 99)
  +                     jjstateSet[jjnewStateCnt++] = 273;
                     break;
  -               case 360:
  -                  if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 361;
  +               case 275:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 274;
                     break;
  -               case 362:
  -                  if (curChar == 115 && kind > 88)
  -                     kind = 88;
  +               case 276:
  +                  if (curChar == 102)
  +                     jjAddStates(507, 508);
                     break;
  -               case 363:
  -                  if (curChar == 97)
  -                     jjstateSet[jjnewStateCnt++] = 362;
  +               case 277:
  +                  if (curChar == 103)
  +                     jjCheckNAddStates(484, 486);
                     break;
  -               case 364:
  -                  if (curChar == 97)
  -                     jjstateSet[jjnewStateCnt++] = 360;
  +               case 280:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(552, 553);
                     break;
  -               case 365:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 364;
  +               case 281:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(484, 486);
                     break;
  -               case 366:
  -                  if (curChar == 114)
  -                     jjstateSet[jjnewStateCnt++] = 365;
  +               case 283:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 282;
                     break;
  -               case 367:
  -                  if (curChar == 116)
  -                     jjAddStates(175, 176);
  +               case 288:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 277;
                     break;
  -               case 370:
  -                  if (curChar == 120)
  -                     jjstateSet[jjnewStateCnt++] = 367;
  +               case 289:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 288;
                     break;
  -               case 371:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 370;
  +               case 290:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 289;
                     break;
  -               case 380:
  -                  if ((0x2000000020L & l) != 0L)
  -                     jjAddStates(229, 230);
  +               case 291:
  +                  if (curChar == 98)
  +                     jjstateSet[jjnewStateCnt++] = 290;
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      else
  -      {
  -         int i2 = (curChar & 0xff) >> 6;
  -         long l2 = 1L << (curChar & 077);
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 330:
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(346, 347);
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(349, 350);
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                  {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(352);
  -                  }
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(353, 354);
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddStates(102, 104);
  +               case 292:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 291;
                     break;
  -               case 6:
  -                  if ((jjbitVec5[i2] & l2) == 0L)
  -                     break;
  -                  if (kind > 115)
  -                     kind = 115;
  -                  jjCheckNAddStates(180, 189);
  +               case 293:
  +                  if (curChar == 115)
  +                     jjstateSet[jjnewStateCnt++] = 292;
                     break;
  -               case 386:
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(346, 347);
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(349, 350);
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                  {
  -                     if (kind > 115)
  -                        kind = 115;
  -                     jjCheckNAdd(352);
  -                  }
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(353, 354);
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddStates(102, 104);
  +               case 295:
  +                  if (curChar == 103)
  +                     jjstateSet[jjnewStateCnt++] = 294;
                     break;
  -               case 1:
  -                  if ((jjbitVec2[i2] & l2) != 0L)
  -                     jjAddStates(65, 66);
  +               case 296:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 295;
                     break;
  -               case 16:
  -                  if ((jjbitVec5[i2] & l2) == 0L)
  -                     break;
  -                  if (kind > 54)
  -                     kind = 54;
  -                  jjCheckNAdd(17);
  +               case 297:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 296;
                     break;
  -               case 17:
  -                  if ((jjbitVec28[i2] & l2) == 0L)
  -                     break;
  -                  if (kind > 54)
  -                     kind = 54;
  -                  jjCheckNAdd(17);
  +               case 298:
  +                  if (curChar == 119)
  +                     jjstateSet[jjnewStateCnt++] = 297;
                     break;
  -               case 23:
  -                  if ((jjbitVec2[i2] & l2) != 0L)
  -                     jjAddStates(75, 76);
  +               case 299:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 298;
                     break;
  -               case 26:
  -                  if ((jjbitVec2[i2] & l2) != 0L)
  -                     jjAddStates(219, 220);
  +               case 300:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 299;
                     break;
  -               case 228:
  -                  if ((jjbitVec5[i2] & l2) != 0L)
  -                     jjCheckNAddStates(221, 224);
  +               case 301:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 300;
                     break;
  -               case 229:
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(229, 230);
  +               case 302:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 301;
                     break;
  -               case 231:
  -                  if ((jjbitVec5[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(232, 233);
  +               case 303:
  +                  if (curChar == 103)
  +                     jjCheckNAddStates(487, 489);
                     break;
  -               case 232:
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(232, 233);
  +               case 306:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(554, 555);
                     break;
  -               case 319:
  -                  if ((jjbitVec5[i2] & l2) != 0L)
  -                     jjCheckNAddStates(225, 228);
  +               case 307:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(487, 489);
                     break;
  -               case 320:
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(320, 321);
  +               case 309:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 308;
                     break;
  -               case 322:
  -                  if ((jjbitVec5[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(323, 324);
  +               case 314:
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 303;
                     break;
  -               case 323:
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(323, 324);
  +               case 315:
  +                  if (curChar == 105)
  +                     jjstateSet[jjnewStateCnt++] = 314;
                     break;
  -               case 346:
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(346, 347);
  +               case 316:
  +                  if (curChar == 119)
  +                     jjstateSet[jjnewStateCnt++] = 315;
                     break;
  -               case 349:
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(349, 350);
  +               case 317:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 316;
                     break;
  -               case 351:
  -                  if ((jjbitVec5[i2] & l2) == 0L)
  -                     break;
  -                  if (kind > 115)
  -                     kind = 115;
  -                  jjCheckNAdd(352);
  +               case 318:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 317;
                     break;
  -               case 352:
  -                  if ((jjbitVec28[i2] & l2) == 0L)
  -                     break;
  -                  if (kind > 115)
  -                     kind = 115;
  -                  jjCheckNAdd(352);
  +               case 319:
  +                  if (curChar == 108)
  +                     jjstateSet[jjnewStateCnt++] = 318;
                     break;
  -               case 353:
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(353, 354);
  +               case 320:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 319;
                     break;
  -               case 355:
  -                  if ((jjbitVec5[i2] & l2) != 0L)
  -                     jjCheckNAddStates(102, 104);
  +               case 321:
  +                  if (curChar == 110)
  +                     jjAddStates(505, 506);
                     break;
  -               case 356:
  -                  if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddStates(102, 104);
  +               case 322:
  +                  if (curChar == 101)
  +                     jjCheckNAddStates(490, 492);
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      if (kind != 0x7fffffff)
  -      {
  -         jjmatchedKind = kind;
  -         jjmatchedPos = curPos;
  -         kind = 0x7fffffff;
  -      }
  -      ++curPos;
  -      if ((i = jjnewStateCnt) == (startsAt = 386 - (jjnewStateCnt = 
startsAt)))
  -         return curPos;
  -      try { curChar = input_stream.readChar(); }
  -      catch(java.io.IOException e) { return curPos; }
  -   }
  -}
  -private final int jjStopStringLiteralDfa_13(int pos, long active0, long 
active1)
  -{
  -   switch (pos)
  -   {
  -      default :
  -         return -1;
  -   }
  -}
  -private final int jjStartNfa_13(int pos, long active0, long active1)
  -{
  -   return jjMoveNfa_13(jjStopStringLiteralDfa_13(pos, active0, active1), pos 
+ 1);
  -}
  -private final int jjStartNfaWithStates_13(int pos, int kind, int state)
  -{
  -   jjmatchedKind = kind;
  -   jjmatchedPos = pos;
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) { return pos + 1; }
  -   return jjMoveNfa_13(state, pos + 1);
  -}
  -private final int jjMoveStringLiteralDfa0_13()
  -{
  -   switch(curChar)
  -   {
  -      case 123:
  -         return jjStopAtPos(0, 119);
  -      default :
  -         return jjMoveNfa_13(0, 0);
  -   }
  -}
  -private final int jjMoveNfa_13(int startState, int curPos)
  -{
  -   int[] nextStates;
  -   int startsAt = 0;
  -   jjnewStateCnt = 1;
  -   int i = 1;
  -   jjstateSet[0] = startState;
  -   int j, kind = 0x7fffffff;
  -   for (;;)
  -   {
  -      if (++jjround == 0x7fffffff)
  -         ReInitRounds();
  -      if (curChar < 64)
  -      {
  -         long l = 1L << curChar;
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 0:
  -                  if ((0xffffffff00002600L & l) != 0L)
  -                     kind = 121;
  +               case 325:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(556, 557);
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      else if (curChar < 128)
  -      {
  -         long l = 1L << (curChar & 077);
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 0:
  -                  kind = 121;
  +               case 326:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(490, 492);
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      else
  -      {
  -         int i2 = (curChar & 0xff) >> 6;
  -         long l2 = 1L << (curChar & 077);
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 0:
  -                  if ((jjbitVec2[i2] & l2) != 0L && kind > 121)
  -                     kind = 121;
  +               case 328:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 327;
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      if (kind != 0x7fffffff)
  -      {
  -         jjmatchedKind = kind;
  -         jjmatchedPos = curPos;
  -         kind = 0x7fffffff;
  -      }
  -      ++curPos;
  -      if ((i = jjnewStateCnt) == (startsAt = 1 - (jjnewStateCnt = startsAt)))
  -         return curPos;
  -      try { curChar = input_stream.readChar(); }
  -      catch(java.io.IOException e) { return curPos; }
  -   }
  -}
  -private final int jjStopStringLiteralDfa_12(int pos, long active0, long 
active1)
  -{
  -   switch (pos)
  -   {
  -      default :
  -         return -1;
  -   }
  -}
  -private final int jjStartNfa_12(int pos, long active0, long active1)
  -{
  -   return jjMoveNfa_12(jjStopStringLiteralDfa_12(pos, active0, active1), pos 
+ 1);
  -}
  -private final int jjStartNfaWithStates_12(int pos, int kind, int state)
  -{
  -   jjmatchedKind = kind;
  -   jjmatchedPos = pos;
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) { return pos + 1; }
  -   return jjMoveNfa_12(state, pos + 1);
  -}
  -private final int jjMoveStringLiteralDfa0_12()
  -{
  -   switch(curChar)
  -   {
  -      case 123:
  -         return jjStopAtPos(0, 119);
  -      default :
  -         return jjMoveNfa_12(0, 0);
  -   }
  -}
  -private final int jjMoveNfa_12(int startState, int curPos)
  -{
  -   int[] nextStates;
  -   int startsAt = 0;
  -   jjnewStateCnt = 1;
  -   int i = 1;
  -   jjstateSet[0] = startState;
  -   int j, kind = 0x7fffffff;
  -   for (;;)
  -   {
  -      if (++jjround == 0x7fffffff)
  -         ReInitRounds();
  -      if (curChar < 64)
  -      {
  -         long l = 1L << curChar;
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 0:
  -                  if ((0xffffffff00002600L & l) != 0L)
  -                     kind = 121;
  +               case 333:
  +                  if (curChar == 99)
  +                     jjstateSet[jjnewStateCnt++] = 322;
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      else if (curChar < 128)
  -      {
  -         long l = 1L << (curChar & 077);
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 0:
  -                  kind = 121;
  +               case 334:
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 333;
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      else
  -      {
  -         int i2 = (curChar & 0xff) >> 6;
  -         long l2 = 1L << (curChar & 077);
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 0:
  -                  if ((jjbitVec2[i2] & l2) != 0L && kind > 121)
  -                     kind = 121;
  +               case 335:
  +                  if (curChar == 112)
  +                     jjstateSet[jjnewStateCnt++] = 334;
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      if (kind != 0x7fffffff)
  -      {
  -         jjmatchedKind = kind;
  -         jjmatchedPos = curPos;
  -         kind = 0x7fffffff;
  -      }
  -      ++curPos;
  -      if ((i = jjnewStateCnt) == (startsAt = 1 - (jjnewStateCnt = startsAt)))
  -         return curPos;
  -      try { curChar = input_stream.readChar(); }
  -      catch(java.io.IOException e) { return curPos; }
  -   }
  -}
  -private final int jjStopStringLiteralDfa_7(int pos, long active0, long 
active1)
  -{
  -   switch (pos)
  -   {
  -      default :
  -         return -1;
  -   }
  -}
  -private final int jjStartNfa_7(int pos, long active0, long active1)
  -{
  -   return jjMoveNfa_7(jjStopStringLiteralDfa_7(pos, active0, active1), pos + 
1);
  -}
  -private final int jjStartNfaWithStates_7(int pos, int kind, int state)
  -{
  -   jjmatchedKind = kind;
  -   jjmatchedPos = pos;
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) { return pos + 1; }
  -   return jjMoveNfa_7(state, pos + 1);
  -}
  -private final int jjMoveStringLiteralDfa0_7()
  -{
  -   switch(curChar)
  -   {
  -      case 40:
  -         return jjStopAtPos(0, 117);
  -      default :
  -         return jjMoveNfa_7(0, 0);
  -   }
  -}
  -private final int jjMoveNfa_7(int startState, int curPos)
  -{
  -   int[] nextStates;
  -   int startsAt = 0;
  -   jjnewStateCnt = 8;
  -   int i = 1;
  -   jjstateSet[0] = startState;
  -   int j, kind = 0x7fffffff;
  -   for (;;)
  -   {
  -      if (++jjround == 0x7fffffff)
  -         ReInitRounds();
  -      if (curChar < 64)
  -      {
  -         long l = 1L << curChar;
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 0:
  -                  if ((0x100002600L & l) == 0L)
  -                     break;
  -                  if (kind > 2)
  -                     kind = 2;
  -                  jjCheckNAddTwoStates(6, 7);
  +               case 336:
  +                  if (curChar == 115)
  +                     jjstateSet[jjnewStateCnt++] = 335;
                     break;
  -               case 1:
  -                  if ((0x3ff600000000000L & l) != 0L)
  -                     jjAddStates(95, 96);
  +               case 337:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 336;
                     break;
  -               case 2:
  -                  if (curChar == 58)
  -                     jjstateSet[jjnewStateCnt++] = 3;
  +               case 338:
  +                  if (curChar == 109)
  +                     jjstateSet[jjnewStateCnt++] = 337;
                     break;
  -               case 4:
  -                  if ((0x3ff600000000000L & l) == 0L)
  -                     break;
  -                  if (kind > 116)
  -                     kind = 116;
  -                  jjstateSet[jjnewStateCnt++] = 4;
  +               case 339:
  +                  if (curChar == 97)
  +                     jjstateSet[jjnewStateCnt++] = 338;
                     break;
  -               case 6:
  -                  if ((0x100002600L & l) == 0L)
  -                     break;
  -                  if (kind > 2)
  -                     kind = 2;
  -                  jjCheckNAdd(6);
  +               case 340:
  +                  if (curChar == 101)
  +                     jjCheckNAddStates(493, 495);
                     break;
  -               case 7:
  -                  if ((0x100002600L & l) == 0L)
  -                     break;
  -                  if (kind > 4)
  -                     kind = 4;
  -                  jjCheckNAdd(7);
  +               case 343:
  +                  if ((0xdfffffffffffffffL & l) != 0L)
  +                     jjAddStates(558, 559);
                     break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      else if (curChar < 128)
  -      {
  -         long l = 1L << (curChar & 077);
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 0:
  +               case 344:
  +                  if (curChar == 125)
  +                     jjCheckNAddStates(493, 495);
  +                  break;
  +               case 346:
  +                  if (curChar == 123)
  +                     jjstateSet[jjnewStateCnt++] = 345;
  +                  break;
  +               case 350:
  +                  if (curChar == 100)
  +                     jjstateSet[jjnewStateCnt++] = 340;
  +                  break;
  +               case 351:
  +                  if (curChar == 111)
  +                     jjstateSet[jjnewStateCnt++] = 350;
  +                  break;
  +               case 352:
                     if ((0x7fffffe87fffffeL & l) == 0L)
                        break;
                     if (kind > 116)
                        kind = 116;
  -                  jjCheckNAddStates(99, 101);
  +                  jjCheckNAddStates(500, 504);
                     break;
  -               case 1:
  +               case 353:
                     if ((0x7fffffe87fffffeL & l) != 0L)
  -                     jjCheckNAddTwoStates(1, 2);
  +                     jjCheckNAddTwoStates(353, 354);
                     break;
  -               case 3:
  -               case 4:
  +               case 356:
  +                  if ((0x7fffffe87fffffeL & l) != 0L)
  +                     jjCheckNAddTwoStates(356, 357);
  +                  break;
  +               case 358:
  +               case 359:
                     if ((0x7fffffe87fffffeL & l) == 0L)
                        break;
                     if (kind > 116)
                        kind = 116;
  -                  jjCheckNAdd(4);
  +                  jjCheckNAdd(359);
                     break;
                  default : break;
               }
  @@ -7509,30 +10463,124 @@
            {
               switch(jjstateSet[--i])
               {
  -               case 0:
  +               case 13:
                     if ((jjbitVec5[i2] & l2) == 0L)
                        break;
                     if (kind > 116)
                        kind = 116;
  -                  jjCheckNAddStates(99, 101);
  +                  jjCheckNAddStates(500, 504);
                     break;
  -               case 1:
  +               case 3:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(520, 521);
  +                  break;
  +               case 16:
  +                  if ((jjbitVec5[i2] & l2) == 0L)
  +                     break;
  +                  if (kind > 59)
  +                     kind = 59;
  +                  jjCheckNAdd(17);
  +                  break;
  +               case 17:
  +                  if ((jjbitVec28[i2] & l2) == 0L)
  +                     break;
  +                  if (kind > 59)
  +                     kind = 59;
  +                  jjCheckNAdd(17);
  +                  break;
  +               case 21:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(522, 523);
  +                  break;
  +               case 33:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(524, 525);
  +                  break;
  +               case 39:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(526, 527);
  +                  break;
  +               case 52:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(530, 531);
  +                  break;
  +               case 66:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(532, 533);
  +                  break;
  +               case 82:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(534, 535);
  +                  break;
  +               case 101:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(536, 537);
  +                  break;
  +               case 129:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(538, 539);
  +                  break;
  +               case 144:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(540, 541);
  +                  break;
  +               case 170:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(542, 543);
  +                  break;
  +               case 188:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(544, 545);
  +                  break;
  +               case 219:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(546, 547);
  +                  break;
  +               case 237:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(548, 549);
  +                  break;
  +               case 254:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(550, 551);
  +                  break;
  +               case 280:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(552, 553);
  +                  break;
  +               case 306:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(554, 555);
  +                  break;
  +               case 325:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(556, 557);
  +                  break;
  +               case 343:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(558, 559);
  +                  break;
  +               case 353:
                     if ((jjbitVec28[i2] & l2) != 0L)
  -                     jjCheckNAddTwoStates(1, 2);
  +                     jjCheckNAddTwoStates(353, 354);
                     break;
  -               case 3:
  +               case 356:
  +                  if ((jjbitVec28[i2] & l2) != 0L)
  +                     jjCheckNAddTwoStates(356, 357);
  +                  break;
  +               case 358:
                     if ((jjbitVec5[i2] & l2) == 0L)
                        break;
                     if (kind > 116)
                        kind = 116;
  -                  jjCheckNAdd(4);
  +                  jjCheckNAdd(359);
                     break;
  -               case 4:
  +               case 359:
                     if ((jjbitVec28[i2] & l2) == 0L)
                        break;
                     if (kind > 116)
                        kind = 116;
  -                  jjCheckNAdd(4);
  +                  jjCheckNAdd(359);
                     break;
                  default : break;
               }
  @@ -7545,87 +10593,106 @@
            kind = 0x7fffffff;
         }
         ++curPos;
  -      if ((i = jjnewStateCnt) == (startsAt = 8 - (jjnewStateCnt = startsAt)))
  +      if ((i = jjnewStateCnt) == (startsAt = 360 - (jjnewStateCnt = 
startsAt)))
            return curPos;
         try { curChar = input_stream.readChar(); }
         catch(java.io.IOException e) { return curPos; }
      }
   }
   static final int[] jjnextStates = {
  -   1, 3, 12, 13, 22, 24, 29, 30, 38, 40, 50, 52, 71, 73, 79, 81, 
  -   98, 100, 109, 110, 133, 135, 144, 146, 154, 156, 173, 175, 192, 194, 204, 
206, 
  -   215, 216, 220, 221, 223, 224, 220, 221, 223, 224, 226, 213, 218, 190, 
201, 142, 
  -   152, 170, 77, 96, 107, 130, 48, 68, 27, 35, 1, 6, 20, 21, 23, 24, 
  -   26, 1, 4, 68, 69, 70, 72, 73, 75, 12, 16, 23, 24, 36, 37, 41, 
  -   42, 72, 73, 75, 60, 61, 63, 64, 66, 51, 52, 54, 55, 76, 77, 1, 
  -   2, 4, 5, 1, 2, 4, 356, 357, 358, 373, 374, 375, 377, 378, 380, 8, 
  -   12, 19, 20, 33, 35, 40, 42, 46, 47, 55, 57, 67, 69, 87, 94, 101, 
  -   109, 116, 117, 126, 128, 134, 136, 153, 155, 164, 165, 188, 190, 199, 
201, 209, 
  -   211, 227, 228, 229, 230, 243, 244, 254, 256, 260, 261, 266, 268, 285, 
287, 296, 
  -   297, 301, 303, 312, 313, 318, 319, 320, 321, 332, 333, 340, 341, 361, 
363, 368, 
  -   369, 377, 378, 380, 346, 347, 349, 350, 352, 353, 354, 356, 357, 358, 
366, 371, 
  -   330, 338, 344, 310, 315, 283, 294, 298, 258, 263, 197, 207, 225, 241, 
251, 132, 
  -   151, 162, 185, 65, 85, 99, 114, 123, 38, 44, 52, 26, 27, 229, 230, 232, 
  -   233, 320, 321, 323, 324, 381, 382, 
  +   2, 7, 0, 5, 10, 13, 10, 12, 16, 2, 5, 8, 14, 10, 12, 50, 
  +   52, 56, 1, 6, 11, 24, 29, 30, 58, 59, 61, 62, 64, 3, 13, 26, 
  +   32, 42, 45, 48, 54, 50, 52, 9, 10, 9, 10, 12, 15, 18, 36, 37, 
  +   38, 40, 41, 43, 59, 61, 65, 7, 12, 16, 25, 30, 31, 40, 41, 43, 
  +   68, 73, 75, 82, 87, 89, 95, 100, 101, 111, 116, 118, 130, 135, 137, 157, 
  +   162, 180, 164, 169, 170, 189, 194, 201, 210, 215, 223, 232, 237, 238, 
249, 254, 
  +   256, 264, 269, 271, 290, 295, 297, 308, 313, 314, 339, 344, 346, 357, 
362, 364, 
  +   374, 379, 381, 399, 404, 405, 406, 407, 409, 410, 415, 416, 410, 415, 
416, 429, 
  +   434, 435, 447, 452, 454, 460, 465, 466, 473, 478, 480, 499, 504, 506, 
517, 522, 
  +   523, 529, 534, 536, 547, 552, 553, 560, 565, 566, 567, 568, 570, 571, 
576, 577, 
  +   571, 576, 577, 588, 593, 594, 603, 608, 609, 617, 622, 623, 624, 625, 
633, 638, 
  +   640, 647, 652, 653, 659, 660, 662, 663, 666, 667, 669, 670, 675, 676, 
670, 675, 
  +   676, 681, 686, 687, 697, 702, 709, 659, 660, 662, 663, 665, 666, 667, 
669, 670, 
  +   675, 676, 695, 717, 631, 645, 657, 586, 601, 614, 545, 557, 497, 515, 
526, 458, 
  +   470, 355, 372, 397, 427, 444, 262, 288, 306, 336, 128, 155, 187, 208, 
230, 246, 
  +   80, 93, 108, 1, 2, 4, 5, 9, 18, 27, 33, 44, 45, 51, 54, 57, 
  +   63, 59, 61, 70, 77, 84, 91, 97, 103, 113, 120, 132, 139, 159, 182, 166, 
  +   172, 191, 203, 212, 225, 234, 240, 251, 258, 266, 273, 292, 299, 310, 
316, 341, 
  +   348, 359, 366, 376, 383, 401, 420, 406, 407, 409, 410, 415, 416, 412, 
418, 431, 
  +   437, 449, 456, 462, 468, 475, 482, 501, 508, 519, 525, 531, 538, 549, 
555, 562, 
  +   581, 567, 568, 570, 571, 576, 577, 573, 579, 590, 596, 605, 611, 619, 
629, 624, 
  +   625, 627, 635, 642, 649, 655, 672, 678, 683, 689, 699, 711, 117, 118, 
119, 121, 
  +   122, 124, 140, 142, 146, 7, 12, 14, 25, 30, 32, 43, 48, 52, 61, 66, 
  +   67, 74, 79, 80, 88, 93, 94, 100, 105, 106, 121, 122, 124, 149, 154, 172, 
  +   156, 161, 162, 181, 186, 193, 202, 207, 215, 224, 225, 227, 228, 230, 
179, 200, 
  +   222, 9, 16, 27, 34, 45, 54, 63, 69, 76, 82, 90, 96, 102, 108, 125, 
  +   126, 132, 135, 138, 144, 140, 142, 151, 174, 158, 164, 183, 195, 204, 
217, 1, 
  +   4, 16, 18, 22, 8, 11, 14, 20, 16, 18, 41, 43, 47, 1, 6, 8, 
  +   19, 24, 25, 50, 55, 57, 64, 69, 70, 80, 85, 87, 99, 104, 106, 127, 
  +   132, 134, 142, 147, 149, 168, 173, 175, 186, 191, 192, 217, 222, 224, 
235, 240, 
  +   242, 252, 257, 259, 278, 283, 285, 304, 309, 311, 323, 328, 330, 341, 
346, 347, 
  +   353, 354, 356, 357, 353, 354, 356, 357, 359, 339, 351, 302, 320, 233, 
250, 275, 
  +   140, 166, 184, 214, 97, 124, 62, 77, 3, 10, 21, 27, 33, 36, 39, 45, 
  +   41, 43, 52, 59, 66, 72, 82, 89, 101, 108, 129, 136, 144, 151, 170, 177, 
  +   188, 194, 219, 226, 237, 244, 254, 261, 280, 287, 306, 313, 325, 332, 
343, 349, 
   };
   public static final String[] jjstrLiteralImages = {
   "", null, null, null, null, null, null, null, null, null, null, null, null, 
  -null, null, null, null, null, "\157\162", "\141\156\144", "\144\151\166", 
  -"\151\144\151\166", "\155\157\144", "\52", "\151\156", 
"\163\141\164\151\163\146\151\145\163", 
  -"\162\145\164\165\162\156", "\164\150\145\156", "\145\154\163\145", 
"\164\157", 
  -"\151\156\164\145\162\163\145\143\164", "\165\156\151\157\156", 
"\145\170\143\145\160\164", 
  -"\160\162\145\143\145\144\145\163", "\146\157\154\154\157\167\163", null, 
"\151\164\145\155", 
  +null, null, null, null, null, null, null, null, null, "\157\162", 
"\141\156\144", 
  +"\144\151\166", "\151\144\151\166", "\155\157\144", "\52", "\151\156", 
  +"\143\157\156\164\145\170\164", "\163\141\164\151\163\146\151\145\163", 
"\162\145\164\165\162\156", 
  +"\164\150\145\156", "\145\154\163\145", "\164\157", 
"\151\156\164\145\162\163\145\143\164", 
  +"\165\156\151\157\156", "\145\170\143\145\160\164", null, null, 
"\151\164\145\155", 
   "\145\154\145\155\145\156\164", "\141\164\164\162\151\142\165\164\145", 
null, null, null, null, null, null, 
  -null, null, "\164\171\160\145", "\156\157\144\145", "\145\155\160\164\171", 
null, 
  -null, "\52", null, null, "\57", "\57\57", "\57", "\57\57", "\75", 
"\151\163", 
  -"\41\75", "\151\163\156\157\164", "\74\75", "\74\74", "\76\75", "\76\76", 
"\145\161", 
  -"\156\145", "\147\164", "\147\145", "\154\164", "\154\145", "\74", "\76", 
"\55", "\53", 
  -"\77", "\174", "\50", "\100", "\133", "\135", "\51", null, null, null, null, 
null, 
  -"\166\141\154\151\144\141\164\145", null, null, null, null, 
"\143\157\155\155\145\156\164", 
  -"\144\157\143\165\155\145\156\164", null, "\164\145\170\164", 
"\165\156\164\171\160\145\144", 
  
-"\160\162\157\143\145\163\163\151\156\147\55\151\156\163\164\162\165\143\164\151\157\156",
 null, null, null, null, null, "\54", null, null, "\56", "\56\56", null, null, 
  -null, "\44", null, null, null, "\50", null, "\173", "\175", null, null, 
null, null, 
  -null, null, null, null, };
  +null, null, null, null, "\156\157\144\145", "\145\155\160\164\171", null, 
null, 
  +"\52", null, null, "\57", "\57\57", "\57", "\57\57", "\75", "\151\163", 
"\41\75", 
  +"\151\163\156\157\164", "\74\75", "\74\74", "\76\75", "\76\76", "\145\161", 
"\156\145", "\147\164", 
  +"\147\145", "\154\164", "\154\145", "\74", "\76", "\55", "\53", "\77", 
"\174", "\50", 
  +"\100", "\133", "\135", "\51", null, null, null, null, null, null, null, 
null, 
  +"\143\157\155\155\145\156\164", "\144\157\143\165\155\145\156\164", null, 
"\164\145\170\164", 
  +"\165\156\164\171\160\145\144", 
  
+"\160\162\157\143\145\163\163\151\156\147\55\151\156\163\164\162\165\143\164\151\157\156",
 null, null, null, null, null, "\54", "\56", "\56\56", null, null, null, "\44", 
  +null, null, null, "\173", "\173", "\175", null, null, null, null, null, 
null, null, 
  +null, };
   public static final String[] lexStateNames = {
      "DEFAULT", 
  -   "ELEMENT_CONTENT", 
      "OPERATOR", 
  +   "NAMESPACEKEYWORD", 
      "QNAME", 
      "NAMESPACEDECL", 
      "XMLSPACE_DECL", 
      "ITEMTYPE", 
  -   "FUNCDEF", 
  -   "NAMESPACEKEYWORD", 
  +   "VARNAME", 
  +   "ELEMENT_CONTENT", 
      "START_TAG", 
      "END_TAG", 
  -   "VARNAME", 
      "QUOT_ATTRIBUTE_CONTENT", 
      "APOS_ATTRIBUTE_CONTENT", 
      "CDATA_SECTION", 
  -   "PROCESSING_INSTRUCTION", 
  +   "PROCESSING_INSTRUCTION_CONTENT", 
      "XML_COMMENT", 
      "XQUERY_COMMENT", 
   };
   public static final int[] jjnewLexState = {
  -   -1, -1, -1, -1, -1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, 
0, 0, 
  -   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, -1, -1, -1, -1, 8, 8, 3, 0, 0, 
0, -1, 
  -   -1, -1, 2, 2, 2, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
0, 
  -   0, 0, 0, 0, 0, 3, 0, 2, 2, 11, 11, 11, 6, 6, 2, -1, 2, 2, 2, 0, 0, 2, 0, 
0, 0, 
  -   0, 0, 0, 0, -1, 0, 2, 0, 2, 2, -1, -1, -1, 11, 2, 2, -1, 6, -1, 0, -1, 
-1, -1, -1, -1, 
  +   -1, 1, 1, 1, 1, -1, -1, -1, -1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 
0, 0, 
  +   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, -1, -1, -1, -1, 4, 
2, 2, 
  +   3, 0, 1, 0, 0, -1, -1, 1, 1, 1, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
0, 
  +   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 1, 1, 7, 7, 7, 6, 6, 0, -1, -1, 0, 0, 
-1, 
  +   0, 0, 0, 0, 0, 0, 0, -1, -1, 1, 1, -1, -1, -1, 7, 1, 1, -1, 0, 0, -1, -1, 
-1, -1, -1, 
      -1, -1, -1, -1, 
   };
   static final long[] jjtoToken = {
  -   0xfff3fffffffffff1L, 0x3fe3ffffbffffffL, 0x0L, 
  +   0xfe7fffffffffff1fL, 0x3fc7ffeffffffffL, 0x0L, 
   };
   static final long[] jjtoSkip = {
  -   0x6L, 0x0L, 0x0L, 
  +   0x60L, 0x0L, 0x0L, 
   };
   static final long[] jjtoSpecial = {
  -   0x2L, 0x0L, 0x0L, 
  +   0x20L, 0x0L, 0x0L, 
   };
   private ASCII_CharStream input_stream;
  -private final int[] jjrounds = new int[386];
  -private final int[] jjstateSet = new int[772];
  +private final int[] jjrounds = new int[718];
  +private final int[] jjstateSet = new int[1436];
   StringBuffer image;
   int jjimageLen;
   int lengthOfMatch;
  @@ -7652,7 +10719,7 @@
   {
      int i;
      jjround = 0x80000001;
  -   for (i = 386; i-- > 0;)
  +   for (i = 718; i-- > 0;)
         jjrounds[i] = 0x80000000;
   }
   public void ReInit(ASCII_CharStream stream, int lexState)
  @@ -7662,7 +10729,7 @@
   }
   public void SwitchTo(int lexState)
   {
  -   if (lexState >= 18 || lexState < 0)
  +   if (lexState >= 17 || lexState < 0)
         throw new TokenMgrError("Error: Ignoring invalid lexical state : " + 
lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
      else
         curLexState = lexState;
  @@ -7799,11 +10866,6 @@
          jjmatchedPos = 0;
          curPos = jjMoveStringLiteralDfa0_16();
          break;
  -     case 17:
  -       jjmatchedKind = 0x7fffffff;
  -       jjmatchedPos = 0;
  -       curPos = jjMoveStringLiteralDfa0_17();
  -       break;
      }
        if (jjmatchedKind != 0x7fffffff)
        {
  @@ -7863,40 +10925,68 @@
   {
      switch(jjmatchedKind)
      {
  -      case 39 :
  +      case 43 :
           if (image == null)
               image = new StringBuffer(new 
String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 
1))));
            else
               image.append(new String(input_stream.GetSuffix(jjimageLen + 
(lengthOfMatch = jjmatchedPos + 1))));
                                                                            
pushState(DEFAULT);
            break;
  -      case 40 :
  +      case 44 :
           if (image == null)
               image = new StringBuffer(new 
String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 
1))));
            else
               image.append(new String(input_stream.GetSuffix(jjimageLen + 
(lengthOfMatch = jjmatchedPos + 1))));
                                                                                
pushState(DEFAULT);
            break;
  -      case 41 :
  +      case 45 :
           if (image == null)
               image = new StringBuffer(new 
String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 
1))));
            else
               image.append(new String(input_stream.GetSuffix(jjimageLen + 
(lengthOfMatch = jjmatchedPos + 1))));
                                                    pushState(DEFAULT);
            break;
  -      case 42 :
  +      case 46 :
           if (image == null)
               image = new StringBuffer(new 
String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 
1))));
            else
               image.append(new String(input_stream.GetSuffix(jjimageLen + 
(lengthOfMatch = jjmatchedPos + 1))));
                                                        pushState(DEFAULT);
            break;
  +      case 94 :
  +        if (image == null)
  +            image = new StringBuffer(new 
String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 
1))));
  +         else
  +            image.append(new String(input_stream.GetSuffix(jjimageLen + 
(lengthOfMatch = jjmatchedPos + 1))));
  +                                                   pushState(DEFAULT);
  +         break;
  +      case 99 :
  +        if (image == null)
  +            image = new StringBuffer(new 
String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 
1))));
  +         else
  +            image.append(new String(input_stream.GetSuffix(jjimageLen + 
(lengthOfMatch = jjmatchedPos + 1))));
  +                                                   pushState(DEFAULT);
  +         break;
  +      case 108 :
  +        if (image == null)
  +            image = new StringBuffer(jjstrLiteralImages[108]);
  +         else
  +            image.append(jjstrLiteralImages[108]);
  +                    resetParenStateOrSwitch(DEFAULT);
  +         break;
  +      case 118 :
  +        if (image == null)
  +            image = new StringBuffer(jjstrLiteralImages[118]);
  +         else
  +            image.append(jjstrLiteralImages[118]);
  +                     pushState();
  +         break;
         case 119 :
           if (image == null)
               image = new StringBuffer(jjstrLiteralImages[119]);
            else
               image.append(jjstrLiteralImages[119]);
  -                     pushState();
  +                                  pushState(DEFAULT);
            break;
         case 120 :
           if (image == null)
  
  
  
  1.1.2.1.2.2 +128 -115  
xml-xalan/java/src/org/apache/xpath/parser/Attic/XPathTreeConstants.java
  
  Index: XPathTreeConstants.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xpath/parser/Attic/XPathTreeConstants.java,v
  retrieving revision 1.1.2.1.2.1
  retrieving revision 1.1.2.1.2.2
  diff -u -r1.1.2.1.2.1 -r1.1.2.1.2.2
  --- XPathTreeConstants.java   19 Sep 2002 21:43:30 -0000      1.1.2.1.2.1
  +++ XPathTreeConstants.java   13 Nov 2002 05:27:35 -0000      1.1.2.1.2.2
  @@ -6,118 +6,125 @@
   {
     public int JJTXPATH2 = 0;
     public int JJTMATCHPATTERN = 1;
  -  public int JJTEXPRSEQUENCE = 2;
  -  public int JJTPATTERN = 3;
  -  public int JJTPATHPATTERN = 4;
  -  public int JJTROOT = 5;
  -  public int JJTROOTDESCENDANTS = 6;
  -  public int JJTSLASH = 7;
  -  public int JJTSLASHSLASH = 8;
  -  public int JJTVOID = 9;
  -  public int JJTPATTERNSTEP = 10;
  -  public int JJTAXISCHILD = 11;
  -  public int JJTAXISATTRIBUTE = 12;
  -  public int JJTAT = 13;
  -  public int JJTIDKEYPATTERN = 14;
  -  public int JJTQNAMELPAR = 15;
  -  public int JJTVARNAME = 16;
  -  public int JJTOREXPR = 17;
  -  public int JJTANDEXPR = 18;
  -  public int JJTFLWREXPR = 19;
  -  public int JJTRETURN = 20;
  -  public int JJTQUANTIFIEDEXPR = 21;
  -  public int JJTSOME = 22;
  -  public int JJTEVERY = 23;
  -  public int JJTIN = 24;
  -  public int JJTSATISFIES = 25;
  -  public int JJTIFEXPR = 26;
  -  public int JJTIFLPAR = 27;
  -  public int JJTTHEN = 28;
  -  public int JJTELSE = 29;
  -  public int JJTINSTANCEOFEXPR = 30;
  -  public int JJTINSTANCEOF = 31;
  -  public int JJTCOMPARISONEXPR = 32;
  -  public int JJTRANGEEXPR = 33;
  -  public int JJTADDITIVEEXPR = 34;
  -  public int JJTMULTIPLICATIVEEXPR = 35;
  -  public int JJTUNIONEXPR = 36;
  -  public int JJTINTERSECTEXPR = 37;
  -  public int JJTUNARYEXPR = 38;
  -  public int JJTMINUS = 39;
  -  public int JJTPLUS = 40;
  -  public int JJTPATHEXPR = 41;
  -  public int JJTSTEPEXPR = 42;
  -  public int JJTFORCLAUSE = 43;
  -  public int JJTVALIDATEEXPR = 44;
  -  public int JJTVALIDATE = 45;
  -  public int JJTLBRACE = 46;
  -  public int JJTRBRACE = 47;
  -  public int JJTCASTEXPR = 48;
  -  public int JJTCASTAS = 49;
  -  public int JJTTREATAS = 50;
  -  public int JJTAXISDESCENDANT = 51;
  -  public int JJTAXISSELF = 52;
  -  public int JJTAXISDESCENDANTORSELF = 53;
  -  public int JJTAXISFOLLOWINGSIBLING = 54;
  -  public int JJTAXISFOLLOWING = 55;
  -  public int JJTAXISNAMESPACE = 56;
  -  public int JJTAXISPARENT = 57;
  -  public int JJTAXISANCESTOR = 58;
  -  public int JJTAXISPRECEDINGSIBLING = 59;
  -  public int JJTAXISPRECEDING = 60;
  -  public int JJTAXISANCESTORORSELF = 61;
  -  public int JJTNODETEST = 62;
  -  public int JJTNAMETEST = 63;
  -  public int JJTQNAME = 64;
  -  public int JJTSTAR = 65;
  -  public int JJTNCNAMECOLONSTAR = 66;
  -  public int JJTSTARCOLONNCNAME = 67;
  -  public int JJTKINDTEST = 68;
  -  public int JJTPROCESSINGINSTRUCTIONTEST = 69;
  -  public int JJTSTRINGLITERAL = 70;
  -  public int JJTCOMMENTTEST = 71;
  -  public int JJTTEXTTEST = 72;
  -  public int JJTANYKINDTEST = 73;
  -  public int JJTABBREVIATEDFORWARDSTEP = 74;
  -  public int JJTDOT = 75;
  -  public int JJTDOTDOT = 76;
  -  public int JJTPREDICATES = 77;
  -  public int JJTLBRACK = 78;
  -  public int JJTRBRACK = 79;
  -  public int JJTINTEGERLITERAL = 80;
  -  public int JJTDECIMALLITERAL = 81;
  -  public int JJTDOUBLELITERAL = 82;
  -  public int JJTFUNCTIONCALL = 83;
  -  public int JJTSCHEMACONTEXT = 84;
  -  public int JJTSCHEMAGLOBALCONTEXT = 85;
  -  public int JJTTYPE = 86;
  -  public int JJTSCHEMACONTEXTSTEP = 87;
  -  public int JJTSEQUENCETYPE = 88;
  -  public int JJTEMPTY = 89;
  -  public int JJTITEMTYPE = 90;
  -  public int JJTELEMENTTYPE = 91;
  -  public int JJTATTRIBUTETYPE = 92;
  -  public int JJTNODE = 93;
  -  public int JJTPROCESSINGINSTRUCTION = 94;
  -  public int JJTCOMMENT = 95;
  -  public int JJTTEXT = 96;
  -  public int JJTDOCUMENT = 97;
  -  public int JJTITEM = 98;
  -  public int JJTUNTYPED = 99;
  -  public int JJTATOMICVALUE = 100;
  -  public int JJTELEMORATTRTYPE = 101;
  -  public int JJTSCHEMATYPE = 102;
  -  public int JJTOFTYPE = 103;
  -  public int JJTATOMICTYPE = 104;
  -  public int JJTOCCURRENCEINDICATOR = 105;
  -  public int JJTMULTIPLY = 106;
  -  public int JJTQMARK = 107;
  -  public int JJTEXCEPTEXPR = 108;
  +  public int JJTXPATH = 2;
  +  public int JJTEXPRSEQUENCE = 3;
  +  public int JJTPATTERN = 4;
  +  public int JJTPATHPATTERN = 5;
  +  public int JJTROOT = 6;
  +  public int JJTROOTDESCENDANTS = 7;
  +  public int JJTSLASH = 8;
  +  public int JJTSLASHSLASH = 9;
  +  public int JJTVOID = 10;
  +  public int JJTPATTERNSTEP = 11;
  +  public int JJTAXISCHILD = 12;
  +  public int JJTAXISATTRIBUTE = 13;
  +  public int JJTAT = 14;
  +  public int JJTIDKEYPATTERN = 15;
  +  public int JJTQNAMELPAR = 16;
  +  public int JJTSTRINGLITERAL = 17;
  +  public int JJTVARNAME = 18;
  +  public int JJTOREXPR = 19;
  +  public int JJTANDEXPR = 20;
  +  public int JJTFLWREXPR = 21;
  +  public int JJTRETURN = 22;
  +  public int JJTQUANTIFIEDEXPR = 23;
  +  public int JJTSOME = 24;
  +  public int JJTEVERY = 25;
  +  public int JJTIN = 26;
  +  public int JJTSATISFIES = 27;
  +  public int JJTIFEXPR = 28;
  +  public int JJTIFLPAR = 29;
  +  public int JJTTHEN = 30;
  +  public int JJTELSE = 31;
  +  public int JJTINSTANCEOFEXPR = 32;
  +  public int JJTINSTANCEOF = 33;
  +  public int JJTCASTABLEEXPR = 34;
  +  public int JJTCASTABLE = 35;
  +  public int JJTCOMPARISONEXPR = 36;
  +  public int JJTRANGEEXPR = 37;
  +  public int JJTADDITIVEEXPR = 38;
  +  public int JJTMULTIPLICATIVEEXPR = 39;
  +  public int JJTUNARYEXPR = 40;
  +  public int JJTMINUS = 41;
  +  public int JJTPLUS = 42;
  +  public int JJTUNIONEXPR = 43;
  +  public int JJTINTERSECTEXCEPTEXPR = 44;
  +  public int JJTPATHEXPR = 45;
  +  public int JJTSTEPEXPR = 46;
  +  public int JJTSIMPLEFORCLAUSE = 47;
  +  public int JJTVALIDATEEXPR = 48;
  +  public int JJTVALIDATELBRACE = 49;
  +  public int JJTVALIDATECONTEXT = 50;
  +  public int JJTLBRACEEXPRENCLOSURE = 51;
  +  public int JJTRBRACE = 52;
  +  public int JJTCASTEXPR = 53;
  +  public int JJTCASTAS = 54;
  +  public int JJTTREATEXPR = 55;
  +  public int JJTTREATAS = 56;
  +  public int JJTAXISDESCENDANT = 57;
  +  public int JJTAXISSELF = 58;
  +  public int JJTAXISDESCENDANTORSELF = 59;
  +  public int JJTAXISFOLLOWINGSIBLING = 60;
  +  public int JJTAXISFOLLOWING = 61;
  +  public int JJTAXISNAMESPACE = 62;
  +  public int JJTAXISPARENT = 63;
  +  public int JJTAXISANCESTOR = 64;
  +  public int JJTAXISPRECEDINGSIBLING = 65;
  +  public int JJTAXISPRECEDING = 66;
  +  public int JJTAXISANCESTORORSELF = 67;
  +  public int JJTNODETEST = 68;
  +  public int JJTNAMETEST = 69;
  +  public int JJTQNAME = 70;
  +  public int JJTSTAR = 71;
  +  public int JJTNCNAMECOLONSTAR = 72;
  +  public int JJTSTARCOLONNCNAME = 73;
  +  public int JJTKINDTEST = 74;
  +  public int JJTPROCESSINGINSTRUCTIONTEST = 75;
  +  public int JJTCOMMENTTEST = 76;
  +  public int JJTTEXTTEST = 77;
  +  public int JJTANYKINDTEST = 78;
  +  public int JJTABBREVIATEDFORWARDSTEP = 79;
  +  public int JJTDOT = 80;
  +  public int JJTDOTDOT = 81;
  +  public int JJTPREDICATES = 82;
  +  public int JJTLBRACK = 83;
  +  public int JJTRBRACK = 84;
  +  public int JJTINTEGERLITERAL = 85;
  +  public int JJTDECIMALLITERAL = 86;
  +  public int JJTDOUBLELITERAL = 87;
  +  public int JJTFUNCTIONCALL = 88;
  +  public int JJTSCHEMACONTEXT = 89;
  +  public int JJTINCONTEXT = 90;
  +  public int JJTSCHEMAGLOBALCONTEXT = 91;
  +  public int JJTTYPEQNAME = 92;
  +  public int JJTSCHEMACONTEXTSTEP = 93;
  +  public int JJTSINGLETYPE = 94;
  +  public int JJTQMARK = 95;
  +  public int JJTSEQUENCETYPE = 96;
  +  public int JJTEMPTY = 97;
  +  public int JJTITEMTYPE = 98;
  +  public int JJTELEMENTTYPE = 99;
  +  public int JJTATTRIBUTETYPE = 100;
  +  public int JJTNODE = 101;
  +  public int JJTPROCESSINGINSTRUCTION = 102;
  +  public int JJTCOMMENT = 103;
  +  public int JJTTEXT = 104;
  +  public int JJTDOCUMENT = 105;
  +  public int JJTITEM = 106;
  +  public int JJTUNTYPED = 107;
  +  public int JJTATOMICVALUE = 108;
  +  public int JJTELEMORATTRTYPE = 109;
  +  public int JJTSCHEMATYPE = 110;
  +  public int JJTOFTYPE = 111;
  +  public int JJTATOMICTYPE = 112;
  +  public int JJTOCCURRENCEINDICATOR = 113;
  +  public int JJTMULTIPLY = 114;
   
   
     public String[] jjtNodeName = {
       "XPath2",
       "MatchPattern",
  +    "XPath",
       "ExprSequence",
       "Pattern",
       "PathPattern",
  @@ -132,6 +139,7 @@
       "At",
       "IdKeyPattern",
       "QNameLpar",
  +    "StringLiteral",
       "VarName",
       "OrExpr",
       "AndExpr",
  @@ -148,24 +156,28 @@
       "Else",
       "InstanceofExpr",
       "Instanceof",
  +    "CastableExpr",
  +    "Castable",
       "ComparisonExpr",
       "RangeExpr",
       "AdditiveExpr",
       "MultiplicativeExpr",
  -    "UnionExpr",
  -    "IntersectExceptExpr",
       "UnaryExpr",
       "Minus",
       "Plus",
  +    "UnionExpr",
  +    "IntersectExceptExpr",
       "PathExpr",
       "StepExpr",
  -    "ForClause",
  +    "SimpleForClause",
       "ValidateExpr",
  -    "Validate",
  -    "Lbrace",
  +    "ValidateLbrace",
  +    "ValidateContext",
  +    "LbraceExprEnclosure",
       "Rbrace",
       "CastExpr",
       "CastAs",
  +    "TreatExpr",
       "TreatAs",
       "AxisDescendant",
       "AxisSelf",
  @@ -186,7 +198,6 @@
       "StarColonNCName",
       "KindTest",
       "ProcessingInstructionTest",
  -    "StringLiteral",
       "CommentTest",
       "TextTest",
       "AnyKindTest",
  @@ -201,9 +212,12 @@
       "DoubleLiteral",
       "FunctionCall",
       "SchemaContext",
  +    "InContext",
       "SchemaGlobalContext",
  -    "Type",
  +    "TypeQName",
       "SchemaContextStep",
  +    "SingleType",
  +    "QMark",
       "SequenceType",
       "Empty",
       "ItemType",
  @@ -223,6 +237,5 @@
       "AtomicType",
       "OccurrenceIndicator",
       "Multiply",
  -    "QMark",
     };
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to