geirm       00/11/05 20:13:00

  Modified:    src/java/org/apache/velocity/runtime/parser Parser.java
                        Parser.jj ParserConstants.java
                        ParserTokenManager.java
  Log:
  Parser.jjt followers
  
  Revision  Changes    Path
  1.25      +384 -415  
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/Parser.java
  
  Index: Parser.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/Parser.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- Parser.java       2000/11/06 01:20:36     1.24
  +++ Parser.java       2000/11/06 04:12:58     1.25
  @@ -18,7 +18,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
  - * @version $Id: Parser.java,v 1.24 2000/11/06 01:20:36 jvanzyl Exp $ 
  + * @version $Id: Parser.java,v 1.25 2000/11/06 04:12:58 geirm Exp $ 
   */
   public class Parser/*@bgen(jjtree)*/implements ParserTreeConstants, ParserConstants 
{/*@bgen(jjtree)*/
     protected JJTParserState jjtree = new JJTParserState();
  @@ -113,7 +113,6 @@
           case ESCAPE_SET_DIRECTIVE:
           case ESCAPE_IF_DIRECTIVE:
           case ESCAPE_END_DIRECTIVE:
  -        case ESCAPE_INCLUDE_DIRECTIVE:
           case ESCAPE_ELSEIF_DIRECTIVE:
           case ESCAPE_ELSE_DIRECTIVE:
           case ESCAPE_STOP_DIRECTIVE:
  @@ -125,7 +124,6 @@
           case MULTI_LINE_COMMENT:
           case STRING_LITERAL:
           case NEWLINE:
  -        case INCLUDE_DIRECTIVE:
           case IF_DIRECTIVE:
           case STOP_DIRECTIVE:
           case NUMBER_LITERAL:
  @@ -152,12 +150,12 @@
        } else {
          jjtree.popNode();
        }
  -     if (jjte000 instanceof RuntimeException) {
  -       {if (true) throw (RuntimeException)jjte000;}
  -     }
        if (jjte000 instanceof ParseException) {
          {if (true) throw (ParseException)jjte000;}
        }
  +     if (jjte000 instanceof RuntimeException) {
  +       {if (true) throw (RuntimeException)jjte000;}
  +     }
        {if (true) throw (Error)jjte000;}
       } finally {
        if (jjtc000) {
  @@ -176,9 +174,6 @@
       case IF_DIRECTIVE:
         IfStatement();
         break;
  -    case INCLUDE_DIRECTIVE:
  -      IncludeStatement();
  -      break;
       case STOP_DIRECTIVE:
         StopStatement();
         break;
  @@ -202,7 +197,6 @@
       case ESCAPE_SET_DIRECTIVE:
       case ESCAPE_IF_DIRECTIVE:
       case ESCAPE_END_DIRECTIVE:
  -    case ESCAPE_INCLUDE_DIRECTIVE:
       case ESCAPE_ELSEIF_DIRECTIVE:
       case ESCAPE_ELSE_DIRECTIVE:
       case ESCAPE_STOP_DIRECTIVE:
  @@ -418,7 +412,6 @@
             case ESCAPE_SET_DIRECTIVE:
             case ESCAPE_IF_DIRECTIVE:
             case ESCAPE_END_DIRECTIVE:
  -          case ESCAPE_INCLUDE_DIRECTIVE:
             case ESCAPE_ELSEIF_DIRECTIVE:
             case ESCAPE_ELSE_DIRECTIVE:
             case ESCAPE_STOP_DIRECTIVE:
  @@ -430,7 +423,6 @@
             case MULTI_LINE_COMMENT:
             case STRING_LITERAL:
             case NEWLINE:
  -          case INCLUDE_DIRECTIVE:
             case IF_DIRECTIVE:
             case STOP_DIRECTIVE:
             case NUMBER_LITERAL:
  @@ -452,12 +444,12 @@
         } else {
           jjtree.popNode();
         }
  -      if (jjte001 instanceof RuntimeException) {
  -        {if (true) throw (RuntimeException)jjte001;}
  -      }
         if (jjte001 instanceof ParseException) {
           {if (true) throw (ParseException)jjte001;}
         }
  +      if (jjte001 instanceof RuntimeException) {
  +        {if (true) throw (RuntimeException)jjte001;}
  +      }
         {if (true) throw (Error)jjte001;}
         } finally {
         if (jjtc001) {
  @@ -475,12 +467,12 @@
         } else {
           jjtree.popNode();
         }
  -      if (jjte000 instanceof RuntimeException) {
  -        {if (true) throw (RuntimeException)jjte000;}
  -      }
         if (jjte000 instanceof ParseException) {
           {if (true) throw (ParseException)jjte000;}
         }
  +      if (jjte000 instanceof RuntimeException) {
  +        {if (true) throw (RuntimeException)jjte000;}
  +      }
         {if (true) throw (Error)jjte000;}
       } finally {
         if (jjtc000) {
  @@ -532,12 +524,12 @@
         } else {
           jjtree.popNode();
         }
  -      if (jjte000 instanceof RuntimeException) {
  -        {if (true) throw (RuntimeException)jjte000;}
  -      }
         if (jjte000 instanceof ParseException) {
           {if (true) throw (ParseException)jjte000;}
         }
  +      if (jjte000 instanceof RuntimeException) {
  +        {if (true) throw (RuntimeException)jjte000;}
  +      }
         {if (true) throw (Error)jjte000;}
       } finally {
         if (jjtc000) {
  @@ -627,12 +619,12 @@
         } else {
           jjtree.popNode();
         }
  -      if (jjte000 instanceof RuntimeException) {
  -        {if (true) throw (RuntimeException)jjte000;}
  -      }
         if (jjte000 instanceof ParseException) {
           {if (true) throw (ParseException)jjte000;}
         }
  +      if (jjte000 instanceof RuntimeException) {
  +        {if (true) throw (RuntimeException)jjte000;}
  +      }
         {if (true) throw (Error)jjte000;}
       } finally {
         if (jjtc000) {
  @@ -701,12 +693,12 @@
         } else {
           jjtree.popNode();
         }
  -      if (jjte000 instanceof RuntimeException) {
  -        {if (true) throw (RuntimeException)jjte000;}
  -      }
         if (jjte000 instanceof ParseException) {
           {if (true) throw (ParseException)jjte000;}
         }
  +      if (jjte000 instanceof RuntimeException) {
  +        {if (true) throw (RuntimeException)jjte000;}
  +      }
         {if (true) throw (Error)jjte000;}
       } finally {
         if (jjtc000) {
  @@ -788,9 +780,6 @@
         case ESCAPE_END_DIRECTIVE:
           jj_consume_token(ESCAPE_END_DIRECTIVE);
           break;
  -      case ESCAPE_INCLUDE_DIRECTIVE:
  -        jj_consume_token(ESCAPE_INCLUDE_DIRECTIVE);
  -        break;
         case ESCAPE_ELSEIF_DIRECTIVE:
           jj_consume_token(ESCAPE_ELSEIF_DIRECTIVE);
           break;
  @@ -840,7 +829,6 @@
             case ESCAPE_SET_DIRECTIVE:
             case ESCAPE_IF_DIRECTIVE:
             case ESCAPE_END_DIRECTIVE:
  -          case ESCAPE_INCLUDE_DIRECTIVE:
             case ESCAPE_ELSEIF_DIRECTIVE:
             case ESCAPE_ELSE_DIRECTIVE:
             case ESCAPE_STOP_DIRECTIVE:
  @@ -852,7 +840,6 @@
             case MULTI_LINE_COMMENT:
             case STRING_LITERAL:
             case NEWLINE:
  -          case INCLUDE_DIRECTIVE:
             case IF_DIRECTIVE:
             case STOP_DIRECTIVE:
             case NUMBER_LITERAL:
  @@ -874,12 +861,12 @@
         } else {
           jjtree.popNode();
         }
  -      if (jjte001 instanceof RuntimeException) {
  -        {if (true) throw (RuntimeException)jjte001;}
  -      }
         if (jjte001 instanceof ParseException) {
           {if (true) throw (ParseException)jjte001;}
         }
  +      if (jjte001 instanceof RuntimeException) {
  +        {if (true) throw (RuntimeException)jjte001;}
  +      }
         {if (true) throw (Error)jjte001;}
         } finally {
         if (jjtc001) {
  @@ -921,12 +908,12 @@
         } else {
           jjtree.popNode();
         }
  -      if (jjte000 instanceof RuntimeException) {
  -        {if (true) throw (RuntimeException)jjte000;}
  -      }
         if (jjte000 instanceof ParseException) {
           {if (true) throw (ParseException)jjte000;}
         }
  +      if (jjte000 instanceof RuntimeException) {
  +        {if (true) throw (RuntimeException)jjte000;}
  +      }
         {if (true) throw (Error)jjte000;}
       } finally {
         if (jjtc000) {
  @@ -955,7 +942,6 @@
             case ESCAPE_SET_DIRECTIVE:
             case ESCAPE_IF_DIRECTIVE:
             case ESCAPE_END_DIRECTIVE:
  -          case ESCAPE_INCLUDE_DIRECTIVE:
             case ESCAPE_ELSEIF_DIRECTIVE:
             case ESCAPE_ELSE_DIRECTIVE:
             case ESCAPE_STOP_DIRECTIVE:
  @@ -967,7 +953,6 @@
             case MULTI_LINE_COMMENT:
             case STRING_LITERAL:
             case NEWLINE:
  -          case INCLUDE_DIRECTIVE:
             case IF_DIRECTIVE:
             case STOP_DIRECTIVE:
             case NUMBER_LITERAL:
  @@ -989,12 +974,12 @@
         } else {
           jjtree.popNode();
         }
  -      if (jjte001 instanceof RuntimeException) {
  -        {if (true) throw (RuntimeException)jjte001;}
  -      }
         if (jjte001 instanceof ParseException) {
           {if (true) throw (ParseException)jjte001;}
         }
  +      if (jjte001 instanceof RuntimeException) {
  +        {if (true) throw (RuntimeException)jjte001;}
  +      }
         {if (true) throw (Error)jjte001;}
         } finally {
         if (jjtc001) {
  @@ -1008,12 +993,12 @@
         } else {
           jjtree.popNode();
         }
  -      if (jjte000 instanceof RuntimeException) {
  -        {if (true) throw (RuntimeException)jjte000;}
  -      }
         if (jjte000 instanceof ParseException) {
           {if (true) throw (ParseException)jjte000;}
         }
  +      if (jjte000 instanceof RuntimeException) {
  +        {if (true) throw (RuntimeException)jjte000;}
  +      }
         {if (true) throw (Error)jjte000;}
       } finally {
         if (jjtc000) {
  @@ -1045,7 +1030,6 @@
             case ESCAPE_SET_DIRECTIVE:
             case ESCAPE_IF_DIRECTIVE:
             case ESCAPE_END_DIRECTIVE:
  -          case ESCAPE_INCLUDE_DIRECTIVE:
             case ESCAPE_ELSEIF_DIRECTIVE:
             case ESCAPE_ELSE_DIRECTIVE:
             case ESCAPE_STOP_DIRECTIVE:
  @@ -1057,7 +1041,6 @@
             case MULTI_LINE_COMMENT:
             case STRING_LITERAL:
             case NEWLINE:
  -          case INCLUDE_DIRECTIVE:
             case IF_DIRECTIVE:
             case STOP_DIRECTIVE:
             case NUMBER_LITERAL:
  @@ -1079,12 +1062,12 @@
         } else {
           jjtree.popNode();
         }
  -      if (jjte001 instanceof RuntimeException) {
  -        {if (true) throw (RuntimeException)jjte001;}
  -      }
         if (jjte001 instanceof ParseException) {
           {if (true) throw (ParseException)jjte001;}
         }
  +      if (jjte001 instanceof RuntimeException) {
  +        {if (true) throw (RuntimeException)jjte001;}
  +      }
         {if (true) throw (Error)jjte001;}
         } finally {
         if (jjtc001) {
  @@ -1098,12 +1081,12 @@
         } else {
           jjtree.popNode();
         }
  -      if (jjte000 instanceof RuntimeException) {
  -        {if (true) throw (RuntimeException)jjte000;}
  -      }
         if (jjte000 instanceof ParseException) {
           {if (true) throw (ParseException)jjte000;}
         }
  +      if (jjte000 instanceof RuntimeException) {
  +        {if (true) throw (RuntimeException)jjte000;}
  +      }
         {if (true) throw (Error)jjte000;}
       } finally {
         if (jjtc000) {
  @@ -1135,12 +1118,12 @@
        } else {
          jjtree.popNode();
        }
  -     if (jjte000 instanceof RuntimeException) {
  -       {if (true) throw (RuntimeException)jjte000;}
  -     }
        if (jjte000 instanceof ParseException) {
          {if (true) throw (ParseException)jjte000;}
        }
  +     if (jjte000 instanceof RuntimeException) {
  +       {if (true) throw (RuntimeException)jjte000;}
  +     }
        {if (true) throw (Error)jjte000;}
       } finally {
        if (jjtc000) {
  @@ -1150,20 +1133,6 @@
     }
   
   /**
  - * This method corresponds to an #include
  - * directive in a Velocity template. The
  - * following are examples of #include
  - * constructs that are acceptable in
  - * a template:
  - *
  - * #include "foo.inc" 
  - */
  -  final public void IncludeStatement() throws ParseException {
  -    jj_consume_token(INCLUDE_DIRECTIVE);
  -    jj_consume_token(STRING_LITERAL);
  -  }
  -
  -/**
    * This method corresponds to the #stop
    * directive which just simulates and EOF
    * so that parsing stops. The #stop directive
  @@ -1213,12 +1182,12 @@
         } else {
           jjtree.popNode();
         }
  -      if (jjte000 instanceof RuntimeException) {
  -        {if (true) throw (RuntimeException)jjte000;}
  -      }
         if (jjte000 instanceof ParseException) {
           {if (true) throw (ParseException)jjte000;}
         }
  +      if (jjte000 instanceof RuntimeException) {
  +        {if (true) throw (RuntimeException)jjte000;}
  +      }
         {if (true) throw (Error)jjte000;}
       } finally {
         if (jjtc000) {
  @@ -1243,12 +1212,12 @@
         } else {
           jjtree.popNode();
         }
  -      if (jjte000 instanceof RuntimeException) {
  -        {if (true) throw (RuntimeException)jjte000;}
  -      }
         if (jjte000 instanceof ParseException) {
           {if (true) throw (ParseException)jjte000;}
         }
  +      if (jjte000 instanceof RuntimeException) {
  +        {if (true) throw (RuntimeException)jjte000;}
  +      }
         {if (true) throw (Error)jjte000;}
       } finally {
         if (jjtc000) {
  @@ -1282,12 +1251,12 @@
                      } else {
                        jjtree.popNode();
                      }
  -                   if (jjte001 instanceof RuntimeException) {
  -                     {if (true) throw (RuntimeException)jjte001;}
  -                   }
                      if (jjte001 instanceof ParseException) {
                        {if (true) throw (ParseException)jjte001;}
                      }
  +                   if (jjte001 instanceof RuntimeException) {
  +                     {if (true) throw (RuntimeException)jjte001;}
  +                   }
                      {if (true) throw (Error)jjte001;}
         } finally {
                      if (jjtc001) {
  @@ -1322,12 +1291,12 @@
                        } else {
                          jjtree.popNode();
                        }
  -                     if (jjte001 instanceof RuntimeException) {
  -                       {if (true) throw (RuntimeException)jjte001;}
  -                     }
                        if (jjte001 instanceof ParseException) {
                          {if (true) throw (ParseException)jjte001;}
                        }
  +                     if (jjte001 instanceof RuntimeException) {
  +                       {if (true) throw (RuntimeException)jjte001;}
  +                     }
                        {if (true) throw (Error)jjte001;}
         } finally {
                        if (jjtc001) {
  @@ -1365,12 +1334,12 @@
                                } else {
                                  jjtree.popNode();
                                }
  -                             if (jjte001 instanceof RuntimeException) {
  -                               {if (true) throw (RuntimeException)jjte001;}
  -                             }
                                if (jjte001 instanceof ParseException) {
                                  {if (true) throw (ParseException)jjte001;}
                                }
  +                             if (jjte001 instanceof RuntimeException) {
  +                               {if (true) throw (RuntimeException)jjte001;}
  +                             }
                                {if (true) throw (Error)jjte001;}
           } finally {
                                if (jjtc001) {
  @@ -1392,12 +1361,12 @@
                                    } else {
                                      jjtree.popNode();
                                    }
  -                                 if (jjte002 instanceof RuntimeException) {
  -                                   {if (true) throw (RuntimeException)jjte002;}
  -                                 }
                                    if (jjte002 instanceof ParseException) {
                                      {if (true) throw (ParseException)jjte002;}
                                    }
  +                                 if (jjte002 instanceof RuntimeException) {
  +                                   {if (true) throw (RuntimeException)jjte002;}
  +                                 }
                                    {if (true) throw (Error)jjte002;}
           } finally {
                                    if (jjtc002) {
  @@ -1443,12 +1412,12 @@
                            } else {
                              jjtree.popNode();
                            }
  -                         if (jjte001 instanceof RuntimeException) {
  -                           {if (true) throw (RuntimeException)jjte001;}
  -                         }
                            if (jjte001 instanceof ParseException) {
                              {if (true) throw (ParseException)jjte001;}
                            }
  +                         if (jjte001 instanceof RuntimeException) {
  +                           {if (true) throw (RuntimeException)jjte001;}
  +                         }
                            {if (true) throw (Error)jjte001;}
           } finally {
                            if (jjtc001) {
  @@ -1470,12 +1439,12 @@
                            } else {
                              jjtree.popNode();
                            }
  -                         if (jjte002 instanceof RuntimeException) {
  -                           {if (true) throw (RuntimeException)jjte002;}
  -                         }
                            if (jjte002 instanceof ParseException) {
                              {if (true) throw (ParseException)jjte002;}
                            }
  +                         if (jjte002 instanceof RuntimeException) {
  +                           {if (true) throw (RuntimeException)jjte002;}
  +                         }
                            {if (true) throw (Error)jjte002;}
           } finally {
                            if (jjtc002) {
  @@ -1497,12 +1466,12 @@
                            } else {
                              jjtree.popNode();
                            }
  -                         if (jjte003 instanceof RuntimeException) {
  -                           {if (true) throw (RuntimeException)jjte003;}
  -                         }
                            if (jjte003 instanceof ParseException) {
                              {if (true) throw (ParseException)jjte003;}
                            }
  +                         if (jjte003 instanceof RuntimeException) {
  +                           {if (true) throw (RuntimeException)jjte003;}
  +                         }
                            {if (true) throw (Error)jjte003;}
           } finally {
                            if (jjtc003) {
  @@ -1524,12 +1493,12 @@
                            } else {
                              jjtree.popNode();
                            }
  -                         if (jjte004 instanceof RuntimeException) {
  -                           {if (true) throw (RuntimeException)jjte004;}
  -                         }
                            if (jjte004 instanceof ParseException) {
                              {if (true) throw (ParseException)jjte004;}
                            }
  +                         if (jjte004 instanceof RuntimeException) {
  +                           {if (true) throw (RuntimeException)jjte004;}
  +                         }
                            {if (true) throw (Error)jjte004;}
           } finally {
                            if (jjtc004) {
  @@ -1573,12 +1542,12 @@
                       } else {
                         jjtree.popNode();
                       }
  -                    if (jjte001 instanceof RuntimeException) {
  -                      {if (true) throw (RuntimeException)jjte001;}
  -                    }
                       if (jjte001 instanceof ParseException) {
                         {if (true) throw (ParseException)jjte001;}
                       }
  +                    if (jjte001 instanceof RuntimeException) {
  +                      {if (true) throw (RuntimeException)jjte001;}
  +                    }
                       {if (true) throw (Error)jjte001;}
           } finally {
                       if (jjtc001) {
  @@ -1600,12 +1569,12 @@
                       } else {
                         jjtree.popNode();
                       }
  -                    if (jjte002 instanceof RuntimeException) {
  -                      {if (true) throw (RuntimeException)jjte002;}
  -                    }
                       if (jjte002 instanceof ParseException) {
                         {if (true) throw (ParseException)jjte002;}
                       }
  +                    if (jjte002 instanceof RuntimeException) {
  +                      {if (true) throw (RuntimeException)jjte002;}
  +                    }
                       {if (true) throw (Error)jjte002;}
           } finally {
                       if (jjtc002) {
  @@ -1650,12 +1619,12 @@
                          } else {
                            jjtree.popNode();
                          }
  -                       if (jjte001 instanceof RuntimeException) {
  -                         {if (true) throw (RuntimeException)jjte001;}
  -                       }
                          if (jjte001 instanceof ParseException) {
                            {if (true) throw (ParseException)jjte001;}
                          }
  +                       if (jjte001 instanceof RuntimeException) {
  +                         {if (true) throw (RuntimeException)jjte001;}
  +                       }
                          {if (true) throw (Error)jjte001;}
           } finally {
                          if (jjtc001) {
  @@ -1677,12 +1646,12 @@
                          } else {
                            jjtree.popNode();
                          }
  -                       if (jjte002 instanceof RuntimeException) {
  -                         {if (true) throw (RuntimeException)jjte002;}
  -                       }
                          if (jjte002 instanceof ParseException) {
                            {if (true) throw (ParseException)jjte002;}
                          }
  +                       if (jjte002 instanceof RuntimeException) {
  +                         {if (true) throw (RuntimeException)jjte002;}
  +                       }
                          {if (true) throw (Error)jjte002;}
           } finally {
                          if (jjtc002) {
  @@ -1704,12 +1673,12 @@
                          } else {
                            jjtree.popNode();
                          }
  -                       if (jjte003 instanceof RuntimeException) {
  -                         {if (true) throw (RuntimeException)jjte003;}
  -                       }
                          if (jjte003 instanceof ParseException) {
                            {if (true) throw (ParseException)jjte003;}
                          }
  +                       if (jjte003 instanceof RuntimeException) {
  +                         {if (true) throw (RuntimeException)jjte003;}
  +                       }
                          {if (true) throw (Error)jjte003;}
           } finally {
                          if (jjtc003) {
  @@ -1741,12 +1710,12 @@
                       } else {
                         jjtree.popNode();
                       }
  -                    if (jjte001 instanceof RuntimeException) {
  -                      {if (true) throw (RuntimeException)jjte001;}
  -                    }
                       if (jjte001 instanceof ParseException) {
                         {if (true) throw (ParseException)jjte001;}
                       }
  +                    if (jjte001 instanceof RuntimeException) {
  +                      {if (true) throw (RuntimeException)jjte001;}
  +                    }
                       {if (true) throw (Error)jjte001;}
         } finally {
                       if (jjtc001) {
  @@ -1825,589 +1794,589 @@
       return retval;
     }
   
  -  final private boolean jj_3R_61() {
  -    if (jj_scan_token(LOGICAL_EQUALS)) return true;
  +  final private boolean jj_3R_28() {
  +    if (jj_scan_token(LPAREN)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_57()) return true;
  +    if (jj_3R_36()) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_scan_token(RPAREN)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_58() {
  +  final private boolean jj_3R_33() {
  +    if (jj_scan_token(LBRACKET)) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_61()) {
  -    jj_scanpos = xsp;
  -    if (jj_3R_62()) return true;
  +    if (jj_3R_45()) jj_scanpos = xsp;
  +    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_scan_token(RBRACKET)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_54() {
  -    if (jj_3R_57()) return true;
  +  final private boolean jj_3R_30() {
  +    if (jj_scan_token(STRING_LITERAL)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    Token xsp;
  -    while (true) {
  -      xsp = jj_scanpos;
  -      if (jj_3R_58()) { jj_scanpos = xsp; break; }
  -      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    }
       return false;
     }
   
  -  final private boolean jj_3R_55() {
  -    if (jj_scan_token(LOGICAL_AND)) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_54()) return true;
  +  final private boolean jj_3R_27() {
  +    if (jj_3R_35()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_56() {
  -    if (jj_scan_token(COMMA)) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_29()) return true;
  +  final private boolean jj_3R_26() {
  +    if (jj_3R_34()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_52() {
  -    if (jj_3R_54()) return true;
  +  final private boolean jj_3R_25() {
  +    if (jj_3R_33()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    Token xsp;
  -    while (true) {
  -      xsp = jj_scanpos;
  -      if (jj_3R_55()) { jj_scanpos = xsp; break; }
  -      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    }
       return false;
     }
   
  -  final private boolean jj_3R_53() {
  -    if (jj_scan_token(LOGICAL_OR)) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_52()) return true;
  +  final private boolean jj_3R_24() {
  +    if (jj_3R_32()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3_3() {
  -    if (jj_3R_19()) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_scan_token(EQUALS)) return true;
  +  final private boolean jj_3R_23() {
  +    if (jj_3R_31()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_51() {
  -    if (jj_3R_52()) return true;
  +  final private boolean jj_3R_48() {
  +    if (jj_scan_token(RCURLY)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    Token xsp;
  -    while (true) {
  -      xsp = jj_scanpos;
  -      if (jj_3R_53()) { jj_scanpos = xsp; break; }
  -      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    }
       return false;
     }
   
  -  final private boolean jj_3_2() {
  -    if (jj_3R_18()) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    return false;
  -  }
  -
  -  final private boolean jj_3R_50() {
  -    if (jj_3R_19()) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_scan_token(EQUALS)) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_36()) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    return false;
  -  }
  -
  -  final private boolean jj_3R_21() {
  -    if (jj_3R_29()) return true;
  +  final private boolean jj_3R_31() {
  +    if (jj_scan_token(NUMBER_LITERAL)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    Token xsp;
  -    while (true) {
  -      xsp = jj_scanpos;
  -      if (jj_3R_56()) { jj_scanpos = xsp; break; }
  -      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    }
       return false;
     }
   
  -  final private boolean jj_3R_47() {
  -    if (jj_3R_51()) return true;
  +  final private boolean jj_3R_22() {
  +    if (jj_3R_30()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_36() {
  +  final private boolean jj_3R_19() {
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_46()) {
  +    if (jj_3R_22()) {
       jj_scanpos = xsp;
  -    if (jj_3R_47()) return true;
  +    if (jj_3R_23()) {
  +    jj_scanpos = xsp;
  +    if (jj_3R_24()) {
  +    jj_scanpos = xsp;
  +    if (jj_3R_25()) {
  +    jj_scanpos = xsp;
  +    if (jj_3R_26()) {
  +    jj_scanpos = xsp;
  +    if (jj_3R_27()) {
  +    jj_scanpos = xsp;
  +    if (jj_3R_28()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_46() {
  -    if (jj_3R_50()) return true;
  +  final private boolean jj_3R_74() {
  +    if (jj_3R_19()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_35() {
  -    if (jj_scan_token(FALSE)) return true;
  +  final private boolean jj_3R_77() {
  +    if (jj_scan_token(MODULUS)) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_3R_69()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_34() {
  -    if (jj_scan_token(TRUE)) return true;
  +  final private boolean jj_3R_73() {
  +    if (jj_scan_token(LOGICAL_NOT)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_3R_69()) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3_1() {
  -    if (jj_scan_token(DOT)) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +  final private boolean jj_3R_69() {
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3_2()) {
  +    if (jj_3R_73()) {
       jj_scanpos = xsp;
  -    if (jj_3R_17()) return true;
  +    if (jj_3R_74()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    xsp = jj_scanpos;
  -    if (jj_3R_48()) jj_scanpos = xsp;
  -    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_44() {
  -    if (jj_scan_token(RCURLY)) return true;
  +  final private boolean jj_3R_76() {
  +    if (jj_scan_token(DIVIDE)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_3R_69()) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_43() {
  -    if (jj_scan_token(LCURLY)) return true;
  +  final private boolean jj_3R_75() {
  +    if (jj_scan_token(MULTIPLY)) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_3R_69()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_32() {
  +  final private boolean jj_3R_70() {
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_43()) jj_scanpos = xsp;
  -    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_scan_token(IDENTIFIER)) return true;
  +    if (jj_3R_75()) {
  +    jj_scanpos = xsp;
  +    if (jj_3R_76()) {
  +    jj_scanpos = xsp;
  +    if (jj_3R_77()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    xsp = jj_scanpos;
  -    if (jj_3R_44()) jj_scanpos = xsp;
  -    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    while (true) {
  -      xsp = jj_scanpos;
  -      if (jj_3_1()) { jj_scanpos = xsp; break; }
  -      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    }
  +    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_49() {
  -    if (jj_scan_token(COMMA)) return true;
  +  final private boolean jj_3R_72() {
  +    if (jj_scan_token(MINUS)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_29()) return true;
  +    if (jj_3R_63()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_28() {
  -    if (jj_scan_token(LPAREN)) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_36()) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_scan_token(RPAREN)) return true;
  +  final private boolean jj_3R_63() {
  +    if (jj_3R_69()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    Token xsp;
  +    while (true) {
  +      xsp = jj_scanpos;
  +      if (jj_3R_70()) { jj_scanpos = xsp; break; }
  +      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    }
       return false;
     }
   
  -  final private boolean jj_3R_27() {
  -    if (jj_3R_35()) return true;
  +  final private boolean jj_3R_17() {
  +    if (jj_3R_20()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_18() {
  -    if (jj_3R_20()) return true;
  +  final private boolean jj_3R_71() {
  +    if (jj_scan_token(PLUS)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_scan_token(LPAREN)) return true;
  +    if (jj_3R_63()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    return false;
  +  }
  +
  +  final private boolean jj_3R_64() {
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_21()) jj_scanpos = xsp;
  -    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_scan_token(REFMOD2_RPAREN)) return true;
  +    if (jj_3R_71()) {
  +    jj_scanpos = xsp;
  +    if (jj_3R_72()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_26() {
  -    if (jj_3R_34()) return true;
  +  final private boolean jj_3R_68() {
  +    if (jj_scan_token(LOGICAL_GE)) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_3R_59()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_25() {
  -    if (jj_3R_33()) return true;
  +  final private boolean jj_3R_59() {
  +    if (jj_3R_63()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    Token xsp;
  +    while (true) {
  +      xsp = jj_scanpos;
  +      if (jj_3R_64()) { jj_scanpos = xsp; break; }
  +      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    }
       return false;
     }
   
  -  final private boolean jj_3R_24() {
  -    if (jj_3R_32()) return true;
  +  final private boolean jj_3R_67() {
  +    if (jj_scan_token(LOGICAL_LE)) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_3R_59()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_23() {
  -    if (jj_3R_31()) return true;
  +  final private boolean jj_3R_66() {
  +    if (jj_scan_token(LOGICAL_GT)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_3R_59()) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_22() {
  -    if (jj_3R_30()) return true;
  +  final private boolean jj_3R_65() {
  +    if (jj_scan_token(LOGICAL_LT)) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_3R_59()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_19() {
  +  final private boolean jj_3R_60() {
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_22()) {
  -    jj_scanpos = xsp;
  -    if (jj_3R_23()) {
  -    jj_scanpos = xsp;
  -    if (jj_3R_24()) {
  -    jj_scanpos = xsp;
  -    if (jj_3R_25()) {
  +    if (jj_3R_65()) {
       jj_scanpos = xsp;
  -    if (jj_3R_26()) {
  +    if (jj_3R_66()) {
       jj_scanpos = xsp;
  -    if (jj_3R_27()) {
  +    if (jj_3R_67()) {
       jj_scanpos = xsp;
  -    if (jj_3R_28()) return true;
  +    if (jj_3R_68()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_74() {
  -    if (jj_3R_19()) return true;
  +  final private boolean jj_3R_56() {
  +    if (jj_scan_token(COMMA)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_3R_29()) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_77() {
  -    if (jj_scan_token(MODULUS)) return true;
  +  final private boolean jj_3R_62() {
  +    if (jj_scan_token(LOGICAL_NOT_EQUALS)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_69()) return true;
  +    if (jj_3R_57()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_73() {
  -    if (jj_scan_token(LOGICAL_NOT)) return true;
  +  final private boolean jj_3R_57() {
  +    if (jj_3R_59()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_69()) return true;
  +    Token xsp;
  +    while (true) {
  +      xsp = jj_scanpos;
  +      if (jj_3R_60()) { jj_scanpos = xsp; break; }
  +      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    }
  +    return false;
  +  }
  +
  +  final private boolean jj_3R_61() {
  +    if (jj_scan_token(LOGICAL_EQUALS)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_3R_57()) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_69() {
  +  final private boolean jj_3R_58() {
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_73()) {
  +    if (jj_3R_61()) {
       jj_scanpos = xsp;
  -    if (jj_3R_74()) return true;
  +    if (jj_3R_62()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_42() {
  -    if (jj_3R_31()) return true;
  +  final private boolean jj_3_2() {
  +    if (jj_3R_18()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_76() {
  -    if (jj_scan_token(DIVIDE)) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_69()) return true;
  +  final private boolean jj_3R_54() {
  +    if (jj_3R_57()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    Token xsp;
  +    while (true) {
  +      xsp = jj_scanpos;
  +      if (jj_3R_58()) { jj_scanpos = xsp; break; }
  +      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    }
       return false;
     }
   
  -  final private boolean jj_3R_41() {
  -    if (jj_3R_32()) return true;
  +  final private boolean jj_3R_21() {
  +    if (jj_3R_29()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    Token xsp;
  +    while (true) {
  +      xsp = jj_scanpos;
  +      if (jj_3R_56()) { jj_scanpos = xsp; break; }
  +      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    }
       return false;
     }
   
  -  final private boolean jj_3R_75() {
  -    if (jj_scan_token(MULTIPLY)) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_69()) return true;
  +  final private boolean jj_3R_55() {
  +    if (jj_scan_token(LOGICAL_AND)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    return false;
  -  }
  -
  -  final private boolean jj_3R_70() {
  -    Token xsp;
  -    xsp = jj_scanpos;
  -    if (jj_3R_75()) {
  -    jj_scanpos = xsp;
  -    if (jj_3R_76()) {
  -    jj_scanpos = xsp;
  -    if (jj_3R_77()) return true;
  +    if (jj_3R_54()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_40() {
  -    if (jj_3R_35()) return true;
  +  final private boolean jj_3R_35() {
  +    if (jj_scan_token(FALSE)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_45() {
  -    if (jj_3R_29()) return true;
  +  final private boolean jj_3R_52() {
  +    if (jj_3R_54()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       Token xsp;
       while (true) {
         xsp = jj_scanpos;
  -      if (jj_3R_49()) { jj_scanpos = xsp; break; }
  +      if (jj_3R_55()) { jj_scanpos = xsp; break; }
         if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       }
       return false;
     }
   
  -  final private boolean jj_3R_39() {
  -    if (jj_3R_34()) return true;
  +  final private boolean jj_3R_34() {
  +    if (jj_scan_token(TRUE)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_38() {
  -    if (jj_3R_33()) return true;
  +  final private boolean jj_3R_53() {
  +    if (jj_scan_token(LOGICAL_OR)) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_3R_52()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_20() {
  -    if (jj_scan_token(IDENTIFIER)) return true;
  +  final private boolean jj_3_3() {
  +    if (jj_3R_19()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_scan_token(EQUALS)) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_29() {
  +  final private boolean jj_3R_51() {
  +    if (jj_3R_52()) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    Token xsp;
  +    while (true) {
  +      xsp = jj_scanpos;
  +      if (jj_3R_53()) { jj_scanpos = xsp; break; }
  +      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    }
  +    return false;
  +  }
  +
  +  final private boolean jj_3_1() {
  +    if (jj_scan_token(DOT)) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_37()) {
  -    jj_scanpos = xsp;
  -    if (jj_3R_38()) {
  -    jj_scanpos = xsp;
  -    if (jj_3R_39()) {
  -    jj_scanpos = xsp;
  -    if (jj_3R_40()) {
  -    jj_scanpos = xsp;
  -    if (jj_3R_41()) {
  +    if (jj_3_2()) {
       jj_scanpos = xsp;
  -    if (jj_3R_42()) return true;
  +    if (jj_3R_17()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    xsp = jj_scanpos;
  +    if (jj_3R_48()) jj_scanpos = xsp;
  +    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_37() {
  -    if (jj_3R_30()) return true;
  +  final private boolean jj_3R_44() {
  +    if (jj_scan_token(RCURLY)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_72() {
  -    if (jj_scan_token(MINUS)) return true;
  +  final private boolean jj_3R_50() {
  +    if (jj_3R_19()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_63()) return true;
  +    if (jj_scan_token(EQUALS)) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_3R_36()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_63() {
  -    if (jj_3R_69()) return true;
  +  final private boolean jj_3R_43() {
  +    if (jj_scan_token(LCURLY)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    return false;
  +  }
  +
  +  final private boolean jj_3R_32() {
       Token xsp;
  +    xsp = jj_scanpos;
  +    if (jj_3R_43()) jj_scanpos = xsp;
  +    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_scan_token(IDENTIFIER)) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    xsp = jj_scanpos;
  +    if (jj_3R_44()) jj_scanpos = xsp;
  +    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       while (true) {
         xsp = jj_scanpos;
  -      if (jj_3R_70()) { jj_scanpos = xsp; break; }
  +      if (jj_3_1()) { jj_scanpos = xsp; break; }
         if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       }
       return false;
     }
   
  -  final private boolean jj_3R_71() {
  -    if (jj_scan_token(PLUS)) return true;
  +  final private boolean jj_3R_47() {
  +    if (jj_3R_51()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_63()) return true;
  +    return false;
  +  }
  +
  +  final private boolean jj_3R_49() {
  +    if (jj_scan_token(COMMA)) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_3R_29()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_64() {
  +  final private boolean jj_3R_46() {
  +    if (jj_3R_50()) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    return false;
  +  }
  +
  +  final private boolean jj_3R_36() {
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_71()) {
  +    if (jj_3R_46()) {
       jj_scanpos = xsp;
  -    if (jj_3R_72()) return true;
  +    if (jj_3R_47()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_48() {
  -    if (jj_scan_token(RCURLY)) return true;
  +  final private boolean jj_3R_18() {
  +    if (jj_3R_20()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    return false;
  -  }
  -
  -  final private boolean jj_3R_33() {
  -    if (jj_scan_token(LBRACKET)) return true;
  +    if (jj_scan_token(LPAREN)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_45()) jj_scanpos = xsp;
  +    if (jj_3R_21()) jj_scanpos = xsp;
       else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_scan_token(RBRACKET)) return true;
  +    if (jj_scan_token(REFMOD2_RPAREN)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_68() {
  -    if (jj_scan_token(LOGICAL_GE)) return true;
  +  final private boolean jj_3R_20() {
  +    if (jj_scan_token(IDENTIFIER)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_59()) return true;
  +    return false;
  +  }
  +
  +  final private boolean jj_3R_42() {
  +    if (jj_3R_31()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_59() {
  -    if (jj_3R_63()) return true;
  +  final private boolean jj_3R_41() {
  +    if (jj_3R_32()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    return false;
  +  }
  +
  +  final private boolean jj_3R_45() {
  +    if (jj_3R_29()) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       Token xsp;
       while (true) {
         xsp = jj_scanpos;
  -      if (jj_3R_64()) { jj_scanpos = xsp; break; }
  +      if (jj_3R_49()) { jj_scanpos = xsp; break; }
         if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       }
       return false;
     }
   
  -  final private boolean jj_3R_67() {
  -    if (jj_scan_token(LOGICAL_LE)) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_59()) return true;
  +  final private boolean jj_3R_40() {
  +    if (jj_3R_35()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_66() {
  -    if (jj_scan_token(LOGICAL_GT)) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_59()) return true;
  +  final private boolean jj_3R_39() {
  +    if (jj_3R_34()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_30() {
  -    if (jj_scan_token(STRING_LITERAL)) return true;
  +  final private boolean jj_3R_38() {
  +    if (jj_3R_33()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_65() {
  -    if (jj_scan_token(LOGICAL_LT)) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_59()) return true;
  +  final private boolean jj_3R_37() {
  +    if (jj_3R_30()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_60() {
  +  final private boolean jj_3R_29() {
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_65()) {
  +    if (jj_3R_37()) {
       jj_scanpos = xsp;
  -    if (jj_3R_66()) {
  +    if (jj_3R_38()) {
       jj_scanpos = xsp;
  -    if (jj_3R_67()) {
  +    if (jj_3R_39()) {
       jj_scanpos = xsp;
  -    if (jj_3R_68()) return true;
  +    if (jj_3R_40()) {
  +    jj_scanpos = xsp;
  +    if (jj_3R_41()) {
  +    jj_scanpos = xsp;
  +    if (jj_3R_42()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    return false;
  -  }
  -
  -  final private boolean jj_3R_31() {
  -    if (jj_scan_token(NUMBER_LITERAL)) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    return false;
  -  }
  -
  -  final private boolean jj_3R_62() {
  -    if (jj_scan_token(LOGICAL_NOT_EQUALS)) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_57()) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    return false;
  -  }
  -
  -  final private boolean jj_3R_57() {
  -    if (jj_3R_59()) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    Token xsp;
  -    while (true) {
  -      xsp = jj_scanpos;
  -      if (jj_3R_60()) { jj_scanpos = xsp; break; }
  -      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    }
  -    return false;
  -  }
  -
  -  final private boolean jj_3R_17() {
  -    if (jj_3R_20()) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  @@ -2421,9 +2390,9 @@
     private boolean jj_semLA;
     private int jj_gen;
     final private int[] jj_la1 = new int[36];
  -  final private int[] jj_la1_0 = 
{0x23e07fb0,0x23e07fb0,0x3800000,0x20000002,0x20000002,0x23e07fb0,0x8,0xe0000002,0xe0000002,0x8,0xe0000002,0x0,0x0,0x0,0x0,0x20603fb0,0x23e07fb0,0x0,0x0,0x0,0x23e07fb0,0x23e07fb0,0x0,0xe0000012,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xe0000012,0xe0000012,};
  -  final private int[] jj_la1_1 = 
{0xe2a60001,0xe2a60001,0x0,0xa2800000,0xa2800000,0xe2a60001,0x0,0xa0800000,0xa0800000,0x0,0xa0800000,0x80000000,0x0,0x20000000,0x0,0x40800001,0xe2a60001,0x80000,0x80000,0x100000,0xe2a60001,0xe2a60001,0x1,0xa0804000,0x80,0x40,0x3000,0x3000,0xf00,0xf00,0x6,0x6,0x38,0x38,0xa0804000,0xa0800000,};
  -  final private int[] jj_la1_2 = 
{0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,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_0 = 
{0x91f03fb0,0x91f03fb0,0x1c00000,0x10000002,0x10000002,0x91f03fb0,0x8,0x70000002,0x70000002,0x8,0x70000002,0x0,0x0,0x0,0x0,0x90301fb0,0x91f03fb0,0x0,0x0,0x0,0x91f03fb0,0x91f03fb0,0x80000000,0x70000012,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x70000012,0x70000012,};
  +  final private int[] jj_la1_1 = 
{0x38a90000,0x38a90000,0x0,0x28a00000,0x28a00000,0x38a90000,0x0,0x28200000,0x28200000,0x0,0x28200000,0x20000000,0x40000000,0x8000000,0x40000000,0x10200000,0x38a90000,0x20000,0x20000,0x40000,0x38a90000,0x38a90000,0x0,0x28202000,0x40,0x20,0x1800,0x1800,0x780,0x780,0x3,0x3,0x1c,0x1c,0x28202000,0x28200000,};
  +  final private int[] jj_la1_2 = 
{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 JJCalls[] jj_2_rtns = new JJCalls[3];
     private boolean jj_rescan = false;
     private int jj_gc = 0;
  @@ -2592,8 +2561,8 @@
   
     final public ParseException generateParseException() {
       jj_expentries.removeAllElements();
  -    boolean[] la1tokens = new boolean[67];
  -    for (int i = 0; i < 67; i++) {
  +    boolean[] la1tokens = new boolean[65];
  +    for (int i = 0; i < 65; i++) {
         la1tokens[i] = false;
       }
       if (jj_kind >= 0) {
  @@ -2615,7 +2584,7 @@
           }
         }
       }
  -    for (int i = 0; i < 67; i++) {
  +    for (int i = 0; i < 65; i++) {
         if (la1tokens[i]) {
           jj_expentry = new int[1];
           jj_expentry[0] = i;
  
  
  
  1.25      +90 -162   
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/Parser.jj
  
  Index: Parser.jj
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/Parser.jj,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- Parser.jj 2000/11/06 01:20:36     1.24
  +++ Parser.jj 2000/11/06 04:12:58     1.25
  @@ -103,7 +103,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
  - * @version $Id: Parser.jj,v 1.24 2000/11/06 01:20:36 jvanzyl Exp $ 
  + * @version $Id: Parser.jj,v 1.25 2000/11/06 04:12:58 geirm Exp $ 
   */
   public class Parser/*@bgen(jjtree)*/implements ParserTreeConstants/*@egen*/
   {/*@bgen(jjtree)*/
  @@ -200,7 +200,6 @@
    */
   TOKEN_MGR_DECLS: 
   {  
  -    private boolean incMode;
       private int fileDepth = 0;
   
       private int lparen = 0;
  @@ -216,38 +215,7 @@
   
       Stack streams = new Stack();
       Stack states = new Stack();
  -    
  -    // remove double quotes in the string
  -    String stripQuotes(String str) 
  -    {
  -        int start = str.indexOf("\"");
  -        int end = str.indexOf("\"",start+1);    
  -        return str.substring(start+1,end);
  -    }    
  -    
  -    /**
  -     * Save the state of the current input stream
  -     * and the state of the lexer. So we can process
  -     * the new one.
  -     */
  -    void pushFile(String filename)
  -    {
  -        fileDepth++;
  -        
  -        streams.push(input_stream);
  -        states.push(new Integer(curLexState));
  -        
  -        try
  -        {
  -            FileInputStream fs = new FileInputStream(filename);
  -            ASCII_CharStream new_stream = new ASCII_CharStream(fs,1,1);    
  -            ReInit(new_stream);
  -        }
  -        catch(Exception e)
  -        {
  -        }
  -    }    
  -  
  +   
       /**
        * Retrieve the oldStream and oldState and
        * continue processing the input.
  @@ -511,8 +479,6 @@
        { matchedToken.image = "#if"; }
   |    <ESCAPE_END_DIRECTIVE : "\\#end">   
        { matchedToken.image = "#end"; }
  -|    <ESCAPE_INCLUDE_DIRECTIVE: "\\#include"> 
  -     { matchedToken.image = "#include"; }
   |    <ESCAPE_ELSEIF_DIRECTIVE: "\\#elseif">
        { matchedToken.image = "#elseif"; }
   |    <ESCAPE_ELSE_DIRECTIVE: "\\#else"> 
  @@ -617,7 +583,6 @@
               SwitchTo(PRE_DIRECTIVE);
           }
       } 
  -
   }   
   
   TOKEN :
  @@ -686,16 +651,8 @@
   <REFERENCE,DIRECTIVE,REFMODIFIER,REFMOD2>
   TOKEN :
   {
  -
      <STRING_LITERAL: ( "\"" ( ~["\"","\n","\r"] )* "\"" ) >
       {
  -        if (incMode)
  -        {
  -            matchedToken.image = stripQuotes(image.toString());
  -            pushFile(matchedToken.image);
  -        }
  -        incMode = false;
  -    
           /*
            *  - if we are in REFERENCE || REFMODIFIER then " is an ender
            *  - if we are in DIRECTIVE and haven't seen ( yet, then also drop out. 
  @@ -707,7 +664,6 @@
               stateStackPop();
           else if( curLexState == DIRECTIVE && !inSet && lparen == 0)
               stateStackPop();    
  -
       }
   
   |   <TRUE: "true">
  @@ -762,12 +718,6 @@
           stateStackPop();
       } 
   
  -|   <INCLUDE_DIRECTIVE: "include"> 
  -    { 
  -        incMode = true; 
  -        SwitchTo(DIRECTIVE);
  -    }
  -
   |   <IF_DIRECTIVE: "if">
       {
           SwitchTo(DIRECTIVE);
  @@ -784,12 +734,6 @@
           stateStackPop();
       } 
   
  -//|   <SET_DIRECTIVE: (" "|"\t")* "set" >
  -//    { 
  -//        inSet = true; 
  -//        SwitchTo(DIRECTIVE);
  -//    }
  -
   |   <STOP_DIRECTIVE: "stop">
       {
           matchedToken.kind = EOF;
  @@ -804,8 +748,7 @@
   |   <NUMBER_LITERAL: (<DIGIT>)+ >
       {
           /*
  -         *  in the spirit of Jason's fix :)
  -         *  but check to see if we are in set
  +         * check to see if we are in set
            *    ex.  #set $foo = $foo + 3
            *  because we want to handle the \n after
            */
  @@ -941,12 +884,12 @@
        } else {
          jjtree.popNode();
        }
  -     if (jjte000 instanceof RuntimeException) {
  -       throw (RuntimeException)jjte000;
  -     }
        if (jjte000 instanceof ParseException) {
          throw (ParseException)jjte000;
        }
  +     if (jjte000 instanceof RuntimeException) {
  +       throw (RuntimeException)jjte000;
  +     }
        throw (Error)jjte000;
      } finally {
        if (jjtc000) {
  @@ -963,7 +906,6 @@
   void Statement()       : {}
   {
       IfStatement()
  -|   IncludeStatement()
   |   StopStatement()
   |   Reference()
   |   Comment()
  @@ -1159,12 +1101,12 @@
         } else {
           jjtree.popNode();
         }
  -      if (jjte001 instanceof RuntimeException) {
  -        throw (RuntimeException)jjte001;
  -      }
         if (jjte001 instanceof ParseException) {
           throw (ParseException)jjte001;
         }
  +      if (jjte001 instanceof RuntimeException) {
  +        throw (RuntimeException)jjte001;
  +      }
         throw (Error)jjte001;
       } finally {
         if (jjtc001) {
  @@ -1188,12 +1130,12 @@
         } else {
           jjtree.popNode();
         }
  -      if (jjte000 instanceof RuntimeException) {
  -        throw (RuntimeException)jjte000;
  -      }
         if (jjte000 instanceof ParseException) {
           throw (ParseException)jjte000;
         }
  +      if (jjte000 instanceof RuntimeException) {
  +        throw (RuntimeException)jjte000;
  +      }
         throw (Error)jjte000;
       } finally {
         if (jjtc000) {
  @@ -1219,12 +1161,12 @@
         } else {
           jjtree.popNode();
         }
  -      if (jjte000 instanceof RuntimeException) {
  -        throw (RuntimeException)jjte000;
  -      }
         if (jjte000 instanceof ParseException) {
           throw (ParseException)jjte000;
         }
  +      if (jjte000 instanceof RuntimeException) {
  +        throw (RuntimeException)jjte000;
  +      }
         throw (Error)jjte000;
       } finally {
         if (jjtc000) {
  @@ -1270,12 +1212,12 @@
         } else {
           jjtree.popNode();
         }
  -      if (jjte000 instanceof RuntimeException) {
  -        throw (RuntimeException)jjte000;
  -      }
         if (jjte000 instanceof ParseException) {
           throw (ParseException)jjte000;
         }
  +      if (jjte000 instanceof RuntimeException) {
  +        throw (RuntimeException)jjte000;
  +      }
         throw (Error)jjte000;
       } finally {
         if (jjtc000) {
  @@ -1306,12 +1248,12 @@
         } else {
           jjtree.popNode();
         }
  -      if (jjte000 instanceof RuntimeException) {
  -        throw (RuntimeException)jjte000;
  -      }
         if (jjte000 instanceof ParseException) {
           throw (ParseException)jjte000;
         }
  +      if (jjte000 instanceof RuntimeException) {
  +        throw (RuntimeException)jjte000;
  +      }
         throw (Error)jjte000;
       } finally {
         if (jjtc000) {
  @@ -1382,7 +1324,6 @@
   |   <ESCAPE_SET_DIRECTIVE>
   |   <ESCAPE_IF_DIRECTIVE>
   |   <ESCAPE_END_DIRECTIVE>   
  -|   <ESCAPE_INCLUDE_DIRECTIVE> 
   |   <ESCAPE_ELSEIF_DIRECTIVE>
   |   <ESCAPE_ELSE_DIRECTIVE> 
   |   <ESCAPE_STOP_DIRECTIVE>/*@bgen(jjtree)*/
  @@ -1424,12 +1365,12 @@
         } else {
           jjtree.popNode();
         }
  -      if (jjte001 instanceof RuntimeException) {
  -        throw (RuntimeException)jjte001;
  -      }
         if (jjte001 instanceof ParseException) {
           throw (ParseException)jjte001;
         }
  +      if (jjte001 instanceof RuntimeException) {
  +        throw (RuntimeException)jjte001;
  +      }
         throw (Error)jjte001;
       } finally {
         if (jjtc001) {
  @@ -1447,12 +1388,12 @@
         } else {
           jjtree.popNode();
         }
  -      if (jjte000 instanceof RuntimeException) {
  -        throw (RuntimeException)jjte000;
  -      }
         if (jjte000 instanceof ParseException) {
           throw (ParseException)jjte000;
         }
  +      if (jjte000 instanceof RuntimeException) {
  +        throw (RuntimeException)jjte000;
  +      }
         throw (Error)jjte000;
       } finally {
         if (jjtc000) {
  @@ -1486,12 +1427,12 @@
         } else {
           jjtree.popNode();
         }
  -      if (jjte001 instanceof RuntimeException) {
  -        throw (RuntimeException)jjte001;
  -      }
         if (jjte001 instanceof ParseException) {
           throw (ParseException)jjte001;
         }
  +      if (jjte001 instanceof RuntimeException) {
  +        throw (RuntimeException)jjte001;
  +      }
         throw (Error)jjte001;
       } finally {
         if (jjtc001) {
  @@ -1506,12 +1447,12 @@
         } else {
           jjtree.popNode();
         }
  -      if (jjte000 instanceof RuntimeException) {
  -        throw (RuntimeException)jjte000;
  -      }
         if (jjte000 instanceof ParseException) {
           throw (ParseException)jjte000;
         }
  +      if (jjte000 instanceof RuntimeException) {
  +        throw (RuntimeException)jjte000;
  +      }
         throw (Error)jjte000;
       } finally {
         if (jjtc000) {
  @@ -1546,12 +1487,12 @@
         } else {
           jjtree.popNode();
         }
  -      if (jjte001 instanceof RuntimeException) {
  -        throw (RuntimeException)jjte001;
  -      }
         if (jjte001 instanceof ParseException) {
           throw (ParseException)jjte001;
         }
  +      if (jjte001 instanceof RuntimeException) {
  +        throw (RuntimeException)jjte001;
  +      }
         throw (Error)jjte001;
       } finally {
         if (jjtc001) {
  @@ -1566,12 +1507,12 @@
         } else {
           jjtree.popNode();
         }
  -      if (jjte000 instanceof RuntimeException) {
  -        throw (RuntimeException)jjte000;
  -      }
         if (jjte000 instanceof ParseException) {
           throw (ParseException)jjte000;
         }
  +      if (jjte000 instanceof RuntimeException) {
  +        throw (RuntimeException)jjte000;
  +      }
         throw (Error)jjte000;
       } finally {
         if (jjtc000) {
  @@ -1597,12 +1538,12 @@
        } else {
          jjtree.popNode();
        }
  -     if (jjte000 instanceof RuntimeException) {
  -       throw (RuntimeException)jjte000;
  -     }
        if (jjte000 instanceof ParseException) {
          throw (ParseException)jjte000;
        }
  +     if (jjte000 instanceof RuntimeException) {
  +       throw (RuntimeException)jjte000;
  +     }
        throw (Error)jjte000;
      } finally {
        if (jjtc000) {
  @@ -1612,19 +1553,6 @@
   /*@egen*/
   }    
   
  -/**
  - * This method corresponds to an #include
  - * directive in a Velocity template. The
  - * following are examples of #include
  - * constructs that are acceptable in
  - * a template:
  - *
  - * #include "foo.inc" 
  - */
  -void IncludeStatement()      : {}
  -{
  -    <INCLUDE_DIRECTIVE> <STRING_LITERAL>
  -}
   
   /**
    * This method corresponds to the #stop
  @@ -1661,12 +1589,12 @@
         } else {
           jjtree.popNode();
         }
  -      if (jjte000 instanceof RuntimeException) {
  -        throw (RuntimeException)jjte000;
  -      }
         if (jjte000 instanceof ParseException) {
           throw (ParseException)jjte000;
         }
  +      if (jjte000 instanceof RuntimeException) {
  +        throw (RuntimeException)jjte000;
  +      }
         throw (Error)jjte000;
       } finally {
         if (jjtc000) {
  @@ -1692,12 +1620,12 @@
         } else {
           jjtree.popNode();
         }
  -      if (jjte000 instanceof RuntimeException) {
  -        throw (RuntimeException)jjte000;
  -      }
         if (jjte000 instanceof ParseException) {
           throw (ParseException)jjte000;
         }
  +      if (jjte000 instanceof RuntimeException) {
  +        throw (RuntimeException)jjte000;
  +      }
         throw (Error)jjte000;
       } finally {
         if (jjtc000) {
  @@ -1725,12 +1653,12 @@
                      } else {
                        jjtree.popNode();
                      }
  -                   if (jjte001 instanceof RuntimeException) {
  -                     throw (RuntimeException)jjte001;
  -                   }
                      if (jjte001 instanceof ParseException) {
                        throw (ParseException)jjte001;
                      }
  +                   if (jjte001 instanceof RuntimeException) {
  +                     throw (RuntimeException)jjte001;
  +                   }
                      throw (Error)jjte001;
                    } finally {
                      if (jjtc001) {
  @@ -1759,12 +1687,12 @@
                        } else {
                          jjtree.popNode();
                        }
  -                     if (jjte001 instanceof RuntimeException) {
  -                       throw (RuntimeException)jjte001;
  -                     }
                        if (jjte001 instanceof ParseException) {
                          throw (ParseException)jjte001;
                        }
  +                     if (jjte001 instanceof RuntimeException) {
  +                       throw (RuntimeException)jjte001;
  +                     }
                        throw (Error)jjte001;
                      } finally {
                        if (jjtc001) {
  @@ -1793,12 +1721,12 @@
                                } else {
                                  jjtree.popNode();
                                }
  -                             if (jjte001 instanceof RuntimeException) {
  -                               throw (RuntimeException)jjte001;
  -                             }
                                if (jjte001 instanceof ParseException) {
                                  throw (ParseException)jjte001;
                                }
  +                             if (jjte001 instanceof RuntimeException) {
  +                               throw (RuntimeException)jjte001;
  +                             }
                                throw (Error)jjte001;
                              } finally {
                                if (jjtc001) {
  @@ -1821,12 +1749,12 @@
                                    } else {
                                      jjtree.popNode();
                                    }
  -                                 if (jjte002 instanceof RuntimeException) {
  -                                   throw (RuntimeException)jjte002;
  -                                 }
                                    if (jjte002 instanceof ParseException) {
                                      throw (ParseException)jjte002;
                                    }
  +                                 if (jjte002 instanceof RuntimeException) {
  +                                   throw (RuntimeException)jjte002;
  +                                 }
                                    throw (Error)jjte002;
                                  } finally {
                                    if (jjtc002) {
  @@ -1856,12 +1784,12 @@
                            } else {
                              jjtree.popNode();
                            }
  -                         if (jjte001 instanceof RuntimeException) {
  -                           throw (RuntimeException)jjte001;
  -                         }
                            if (jjte001 instanceof ParseException) {
                              throw (ParseException)jjte001;
                            }
  +                         if (jjte001 instanceof RuntimeException) {
  +                           throw (RuntimeException)jjte001;
  +                         }
                            throw (Error)jjte001;
                          } finally {
                            if (jjtc001) {
  @@ -1884,12 +1812,12 @@
                            } else {
                              jjtree.popNode();
                            }
  -                         if (jjte002 instanceof RuntimeException) {
  -                           throw (RuntimeException)jjte002;
  -                         }
                            if (jjte002 instanceof ParseException) {
                              throw (ParseException)jjte002;
                            }
  +                         if (jjte002 instanceof RuntimeException) {
  +                           throw (RuntimeException)jjte002;
  +                         }
                            throw (Error)jjte002;
                          } finally {
                            if (jjtc002) {
  @@ -1912,12 +1840,12 @@
                            } else {
                              jjtree.popNode();
                            }
  -                         if (jjte003 instanceof RuntimeException) {
  -                           throw (RuntimeException)jjte003;
  -                         }
                            if (jjte003 instanceof ParseException) {
                              throw (ParseException)jjte003;
                            }
  +                         if (jjte003 instanceof RuntimeException) {
  +                           throw (RuntimeException)jjte003;
  +                         }
                            throw (Error)jjte003;
                          } finally {
                            if (jjtc003) {
  @@ -1940,12 +1868,12 @@
                            } else {
                              jjtree.popNode();
                            }
  -                         if (jjte004 instanceof RuntimeException) {
  -                           throw (RuntimeException)jjte004;
  -                         }
                            if (jjte004 instanceof ParseException) {
                              throw (ParseException)jjte004;
                            }
  +                         if (jjte004 instanceof RuntimeException) {
  +                           throw (RuntimeException)jjte004;
  +                         }
                            throw (Error)jjte004;
                          } finally {
                            if (jjtc004) {
  @@ -1975,12 +1903,12 @@
                       } else {
                         jjtree.popNode();
                       }
  -                    if (jjte001 instanceof RuntimeException) {
  -                      throw (RuntimeException)jjte001;
  -                    }
                       if (jjte001 instanceof ParseException) {
                         throw (ParseException)jjte001;
                       }
  +                    if (jjte001 instanceof RuntimeException) {
  +                      throw (RuntimeException)jjte001;
  +                    }
                       throw (Error)jjte001;
                     } finally {
                       if (jjtc001) {
  @@ -2003,12 +1931,12 @@
                       } else {
                         jjtree.popNode();
                       }
  -                    if (jjte002 instanceof RuntimeException) {
  -                      throw (RuntimeException)jjte002;
  -                    }
                       if (jjte002 instanceof ParseException) {
                         throw (ParseException)jjte002;
                       }
  +                    if (jjte002 instanceof RuntimeException) {
  +                      throw (RuntimeException)jjte002;
  +                    }
                       throw (Error)jjte002;
                     } finally {
                       if (jjtc002) {
  @@ -2038,12 +1966,12 @@
                          } else {
                            jjtree.popNode();
                          }
  -                       if (jjte001 instanceof RuntimeException) {
  -                         throw (RuntimeException)jjte001;
  -                       }
                          if (jjte001 instanceof ParseException) {
                            throw (ParseException)jjte001;
                          }
  +                       if (jjte001 instanceof RuntimeException) {
  +                         throw (RuntimeException)jjte001;
  +                       }
                          throw (Error)jjte001;
                        } finally {
                          if (jjtc001) {
  @@ -2066,12 +1994,12 @@
                          } else {
                            jjtree.popNode();
                          }
  -                       if (jjte002 instanceof RuntimeException) {
  -                         throw (RuntimeException)jjte002;
  -                       }
                          if (jjte002 instanceof ParseException) {
                            throw (ParseException)jjte002;
                          }
  +                       if (jjte002 instanceof RuntimeException) {
  +                         throw (RuntimeException)jjte002;
  +                       }
                          throw (Error)jjte002;
                        } finally {
                          if (jjtc002) {
  @@ -2094,12 +2022,12 @@
                          } else {
                            jjtree.popNode();
                          }
  -                       if (jjte003 instanceof RuntimeException) {
  -                         throw (RuntimeException)jjte003;
  -                       }
                          if (jjte003 instanceof ParseException) {
                            throw (ParseException)jjte003;
                          }
  +                       if (jjte003 instanceof RuntimeException) {
  +                         throw (RuntimeException)jjte003;
  +                       }
                          throw (Error)jjte003;
                        } finally {
                          if (jjtc003) {
  @@ -2127,11 +2055,11 @@
                       } else {
                         jjtree.popNode();
                       }
  -                    if (jjte001 instanceof RuntimeException) {
  -                      throw (RuntimeException)jjte001;
  -                    }
                       if (jjte001 instanceof ParseException) {
                         throw (ParseException)jjte001;
  +                    }
  +                    if (jjte001 instanceof RuntimeException) {
  +                      throw (RuntimeException)jjte001;
                       }
                       throw (Error)jjte001;
                     } finally {
  
  
  
  1.12      +51 -55    
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/ParserConstants.java
  
  Index: ParserConstants.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/ParserConstants.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ParserConstants.java      2000/11/05 19:20:37     1.11
  +++ ParserConstants.java      2000/11/06 04:12:59     1.12
  @@ -13,57 +13,55 @@
     int ESCAPE_SET_DIRECTIVE = 7;
     int ESCAPE_IF_DIRECTIVE = 8;
     int ESCAPE_END_DIRECTIVE = 9;
  -  int ESCAPE_INCLUDE_DIRECTIVE = 10;
  -  int ESCAPE_ELSEIF_DIRECTIVE = 11;
  -  int ESCAPE_ELSE_DIRECTIVE = 12;
  -  int ESCAPE_STOP_DIRECTIVE = 13;
  -  int SET_DIRECTIVE = 14;
  -  int DOLLAR = 15;
  -  int DOLLARBANG = 16;
  -  int HASH = 20;
  -  int ESCAPE = 21;
  -  int TEXT = 22;
  -  int SINGLE_LINE_COMMENT = 23;
  -  int FORMAL_COMMENT = 24;
  -  int MULTI_LINE_COMMENT = 25;
  -  int STRING_LITERAL = 29;
  -  int TRUE = 30;
  -  int FALSE = 31;
  -  int NEWLINE = 32;
  -  int MINUS = 33;
  -  int PLUS = 34;
  -  int MULTIPLY = 35;
  -  int DIVIDE = 36;
  -  int MODULUS = 37;
  -  int LOGICAL_AND = 38;
  -  int LOGICAL_OR = 39;
  -  int LOGICAL_LT = 40;
  -  int LOGICAL_LE = 41;
  -  int LOGICAL_GT = 42;
  -  int LOGICAL_GE = 43;
  -  int LOGICAL_EQUALS = 44;
  -  int LOGICAL_NOT_EQUALS = 45;
  -  int LOGICAL_NOT = 46;
  -  int EQUALS = 47;
  -  int END = 48;
  -  int INCLUDE_DIRECTIVE = 49;
  -  int IF_DIRECTIVE = 50;
  -  int ELSEIF_DIRECTIVE = 51;
  -  int ELSE_DIRECTIVE = 52;
  -  int STOP_DIRECTIVE = 53;
  -  int DIGIT = 54;
  -  int NUMBER_LITERAL = 55;
  -  int LETTER = 56;
  -  int WORD = 57;
  -  int ALPHA_CHAR = 58;
  -  int ALPHANUM_CHAR = 59;
  -  int IDENTIFIER_CHAR = 60;
  -  int IDENTIFIER = 61;
  -  int DOT = 62;
  -  int LCURLY = 63;
  -  int RCURLY = 64;
  -  int REFERENCE_TERMINATOR = 65;
  -  int DIRECTIVE_TERMINATOR = 66;
  +  int ESCAPE_ELSEIF_DIRECTIVE = 10;
  +  int ESCAPE_ELSE_DIRECTIVE = 11;
  +  int ESCAPE_STOP_DIRECTIVE = 12;
  +  int SET_DIRECTIVE = 13;
  +  int DOLLAR = 14;
  +  int DOLLARBANG = 15;
  +  int HASH = 19;
  +  int ESCAPE = 20;
  +  int TEXT = 21;
  +  int SINGLE_LINE_COMMENT = 22;
  +  int FORMAL_COMMENT = 23;
  +  int MULTI_LINE_COMMENT = 24;
  +  int STRING_LITERAL = 28;
  +  int TRUE = 29;
  +  int FALSE = 30;
  +  int NEWLINE = 31;
  +  int MINUS = 32;
  +  int PLUS = 33;
  +  int MULTIPLY = 34;
  +  int DIVIDE = 35;
  +  int MODULUS = 36;
  +  int LOGICAL_AND = 37;
  +  int LOGICAL_OR = 38;
  +  int LOGICAL_LT = 39;
  +  int LOGICAL_LE = 40;
  +  int LOGICAL_GT = 41;
  +  int LOGICAL_GE = 42;
  +  int LOGICAL_EQUALS = 43;
  +  int LOGICAL_NOT_EQUALS = 44;
  +  int LOGICAL_NOT = 45;
  +  int EQUALS = 46;
  +  int END = 47;
  +  int IF_DIRECTIVE = 48;
  +  int ELSEIF_DIRECTIVE = 49;
  +  int ELSE_DIRECTIVE = 50;
  +  int STOP_DIRECTIVE = 51;
  +  int DIGIT = 52;
  +  int NUMBER_LITERAL = 53;
  +  int LETTER = 54;
  +  int WORD = 55;
  +  int ALPHA_CHAR = 56;
  +  int ALPHANUM_CHAR = 57;
  +  int IDENTIFIER_CHAR = 58;
  +  int IDENTIFIER = 59;
  +  int DOT = 60;
  +  int LCURLY = 61;
  +  int RCURLY = 62;
  +  int REFERENCE_TERMINATOR = 63;
  +  int DIRECTIVE_TERMINATOR = 64;
   
     int DIRECTIVE = 0;
     int REFMODIFIER = 1;
  @@ -86,7 +84,6 @@
       "\"\\\\#set\"",
       "\"\\\\#if\"",
       "\"\\\\#end\"",
  -    "\"\\\\#include\"",
       "\"\\\\#elseif\"",
       "\"\\\\#else\"",
       "\"\\\\#stop\"",
  @@ -94,7 +91,7 @@
       "<DOLLAR>",
       "\"$!\"",
       "\"##\"",
  -    "<token of kind 18>",
  +    "<token of kind 17>",
       "\"#*\"",
       "<HASH>",
       "\"\\\\\"",
  @@ -102,7 +99,7 @@
       "<SINGLE_LINE_COMMENT>",
       "\"*#\"",
       "\"*#\"",
  -    "<token of kind 26>",
  +    "<token of kind 25>",
       "\" \"",
       "\"\\t\"",
       "<STRING_LITERAL>",
  @@ -125,7 +122,6 @@
       "\"!\"",
       "\"=\"",
       "<END>",
  -    "\"include\"",
       "\"if\"",
       "\"elseif\"",
       "\"else\"",
  
  
  
  1.23      +1256 
-1399jakarta-velocity/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java
  
  Index: ParserTokenManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- ParserTokenManager.java   2000/11/06 01:20:36     1.22
  +++ ParserTokenManager.java   2000/11/06 04:12:59     1.23
  @@ -7,7 +7,6 @@
   
   public class ParserTokenManager implements ParserConstants
   {
  -    private boolean incMode;
       private int fileDepth = 0;
   
       private int lparen = 0;
  @@ -24,37 +23,6 @@
       Stack streams = new Stack();
       Stack states = new Stack();
   
  -    // remove double quotes in the string
  -    String stripQuotes(String str)
  -    {
  -        int start = str.indexOf("\"");
  -        int end = str.indexOf("\"",start+1);
  -        return str.substring(start+1,end);
  -    }
  -
  -    /**
  -     * Save the state of the current input stream
  -     * and the state of the lexer. So we can process
  -     * the new one.
  -     */
  -    void pushFile(String filename)
  -    {
  -        fileDepth++;
  -
  -        streams.push(input_stream);
  -        states.push(new Integer(curLexState));
  -
  -        try
  -        {
  -            FileInputStream fs = new FileInputStream(filename);
  -            ASCII_CharStream new_stream = new ASCII_CharStream(fs,1,1);
  -            ReInit(new_stream);
  -        }
  -        catch(Exception e)
  -        {
  -        }
  -    }
  -
       /**
        * Retrieve the oldStream and oldState and
        * continue processing the input.
  @@ -225,58 +193,58 @@
      switch (pos)
      {
         case 0:
  -         if ((active0 & 0xa0000L) != 0L)
  +         if ((active0 & 0x60000000L) != 0L)
            {
  -            jjmatchedKind = 20;
  -            return 8;
  +            jjmatchedKind = 55;
  +            return 18;
            }
  -         if ((active0 & 0x10000L) != 0L)
  +         if ((active0 & 0x50000L) != 0L)
            {
  -            jjmatchedKind = 15;
  -            return -1;
  +            jjmatchedKind = 19;
  +            return 8;
            }
  -         if ((active0 & 0xc0000000L) != 0L)
  +         if ((active0 & 0x8000L) != 0L)
            {
  -            jjmatchedKind = 57;
  -            return 18;
  +            jjmatchedKind = 14;
  +            return -1;
            }
            return -1;
         case 1:
  -         if ((active0 & 0xc0000000L) != 0L)
  +         if ((active0 & 0x60000000L) != 0L)
            {
  -            jjmatchedKind = 57;
  +            jjmatchedKind = 55;
               jjmatchedPos = 1;
               return 18;
            }
  -         if ((active0 & 0x80000L) != 0L)
  +         if ((active0 & 0x40000L) != 0L)
               return 6;
  -         if ((active0 & 0x10000L) != 0L)
  +         if ((active0 & 0x8000L) != 0L)
            {
               if (jjmatchedPos == 0)
               {
  -               jjmatchedKind = 15;
  +               jjmatchedKind = 14;
                  jjmatchedPos = 0;
               }
               return -1;
            }
            return -1;
         case 2:
  -         if ((active0 & 0xc0000000L) != 0L)
  +         if ((active0 & 0x60000000L) != 0L)
            {
  -            jjmatchedKind = 57;
  +            jjmatchedKind = 55;
               jjmatchedPos = 2;
               return 18;
            }
            return -1;
         case 3:
            if ((active0 & 0x40000000L) != 0L)
  -            return 18;
  -         if ((active0 & 0x80000000L) != 0L)
            {
  -            jjmatchedKind = 57;
  +            jjmatchedKind = 55;
               jjmatchedPos = 3;
               return 18;
            }
  +         if ((active0 & 0x20000000L) != 0L)
  +            return 18;
            return -1;
         default :
            return -1;
  @@ -305,47 +273,47 @@
      switch(curChar)
      {
         case 33:
  -         jjmatchedKind = 46;
  -         return jjMoveStringLiteralDfa1_0(0x200000000000L);
  +         jjmatchedKind = 45;
  +         return jjMoveStringLiteralDfa1_0(0x100000000000L);
         case 35:
  -         return jjMoveStringLiteralDfa1_0(0xa0000L);
  +         return jjMoveStringLiteralDfa1_0(0x50000L);
         case 36:
  -         return jjMoveStringLiteralDfa1_0(0x10000L);
  +         return jjMoveStringLiteralDfa1_0(0x8000L);
         case 37:
  -         return jjStopAtPos(0, 37);
  +         return jjStopAtPos(0, 36);
         case 38:
  -         return jjMoveStringLiteralDfa1_0(0x4000000000L);
  +         return jjMoveStringLiteralDfa1_0(0x2000000000L);
         case 40:
            return jjStopAtPos(0, 4);
         case 42:
  -         return jjStopAtPos(0, 35);
  -      case 43:
            return jjStopAtPos(0, 34);
  +      case 43:
  +         return jjStopAtPos(0, 33);
         case 44:
            return jjStopAtPos(0, 3);
         case 45:
  -         return jjStopAtPos(0, 33);
  +         return jjStopAtPos(0, 32);
         case 47:
  -         return jjStopAtPos(0, 36);
  +         return jjStopAtPos(0, 35);
         case 60:
  -         jjmatchedKind = 40;
  -         return jjMoveStringLiteralDfa1_0(0x20000000000L);
  +         jjmatchedKind = 39;
  +         return jjMoveStringLiteralDfa1_0(0x10000000000L);
         case 61:
  -         jjmatchedKind = 47;
  -         return jjMoveStringLiteralDfa1_0(0x100000000000L);
  -      case 62:
  -         jjmatchedKind = 42;
  +         jjmatchedKind = 46;
            return jjMoveStringLiteralDfa1_0(0x80000000000L);
  +      case 62:
  +         jjmatchedKind = 41;
  +         return jjMoveStringLiteralDfa1_0(0x40000000000L);
         case 91:
            return jjStopAtPos(0, 1);
         case 93:
            return jjStopAtPos(0, 2);
         case 102:
  -         return jjMoveStringLiteralDfa1_0(0x80000000L);
  -      case 116:
            return jjMoveStringLiteralDfa1_0(0x40000000L);
  +      case 116:
  +         return jjMoveStringLiteralDfa1_0(0x20000000L);
         case 124:
  -         return jjMoveStringLiteralDfa1_0(0x8000000000L);
  +         return jjMoveStringLiteralDfa1_0(0x4000000000L);
         default :
            return jjMoveNfa_0(0, 0);
      }
  @@ -360,38 +328,38 @@
      switch(curChar)
      {
         case 33:
  -         if ((active0 & 0x10000L) != 0L)
  -            return jjStopAtPos(1, 16);
  +         if ((active0 & 0x8000L) != 0L)
  +            return jjStopAtPos(1, 15);
            break;
         case 35:
  -         if ((active0 & 0x20000L) != 0L)
  -            return jjStopAtPos(1, 17);
  +         if ((active0 & 0x10000L) != 0L)
  +            return jjStopAtPos(1, 16);
            break;
         case 38:
  -         if ((active0 & 0x4000000000L) != 0L)
  -            return jjStopAtPos(1, 38);
  +         if ((active0 & 0x2000000000L) != 0L)
  +            return jjStopAtPos(1, 37);
            break;
         case 42:
  -         if ((active0 & 0x80000L) != 0L)
  -            return jjStartNfaWithStates_0(1, 19, 6);
  +         if ((active0 & 0x40000L) != 0L)
  +            return jjStartNfaWithStates_0(1, 18, 6);
            break;
         case 61:
  -         if ((active0 & 0x20000000000L) != 0L)
  -            return jjStopAtPos(1, 41);
  +         if ((active0 & 0x10000000000L) != 0L)
  +            return jjStopAtPos(1, 40);
  +         else if ((active0 & 0x40000000000L) != 0L)
  +            return jjStopAtPos(1, 42);
            else if ((active0 & 0x80000000000L) != 0L)
               return jjStopAtPos(1, 43);
            else if ((active0 & 0x100000000000L) != 0L)
               return jjStopAtPos(1, 44);
  -         else if ((active0 & 0x200000000000L) != 0L)
  -            return jjStopAtPos(1, 45);
            break;
         case 97:
  -         return jjMoveStringLiteralDfa2_0(active0, 0x80000000L);
  -      case 114:
            return jjMoveStringLiteralDfa2_0(active0, 0x40000000L);
  +      case 114:
  +         return jjMoveStringLiteralDfa2_0(active0, 0x20000000L);
         case 124:
  -         if ((active0 & 0x8000000000L) != 0L)
  -            return jjStopAtPos(1, 39);
  +         if ((active0 & 0x4000000000L) != 0L)
  +            return jjStopAtPos(1, 38);
            break;
         default :
            break;
  @@ -410,9 +378,9 @@
      switch(curChar)
      {
         case 108:
  -         return jjMoveStringLiteralDfa3_0(active0, 0x80000000L);
  -      case 117:
            return jjMoveStringLiteralDfa3_0(active0, 0x40000000L);
  +      case 117:
  +         return jjMoveStringLiteralDfa3_0(active0, 0x20000000L);
         default :
            break;
      }
  @@ -430,11 +398,11 @@
      switch(curChar)
      {
         case 101:
  -         if ((active0 & 0x40000000L) != 0L)
  -            return jjStartNfaWithStates_0(3, 30, 18);
  +         if ((active0 & 0x20000000L) != 0L)
  +            return jjStartNfaWithStates_0(3, 29, 18);
            break;
         case 115:
  -         return jjMoveStringLiteralDfa4_0(active0, 0x80000000L);
  +         return jjMoveStringLiteralDfa4_0(active0, 0x40000000L);
         default :
            break;
      }
  @@ -452,8 +420,8 @@
      switch(curChar)
      {
         case 101:
  -         if ((active0 & 0x80000000L) != 0L)
  -            return jjStartNfaWithStates_0(4, 31, 18);
  +         if ((active0 & 0x40000000L) != 0L)
  +            return jjStartNfaWithStates_0(4, 30, 18);
            break;
         default :
            break;
  @@ -515,26 +483,26 @@
                  case 0:
                     if ((0x3ff000000000000L & l) != 0L)
                     {
  -                     if (kind > 55)
  -                        kind = 55;
  +                     if (kind > 53)
  +                        kind = 53;
                        jjCheckNAdd(17);
                     }
                     else if ((0x2400L & l) != 0L)
                     {
  -                     if (kind > 32)
  -                        kind = 32;
  +                     if (kind > 31)
  +                        kind = 31;
                     }
                     else if (curChar == 34)
                        jjCheckNAddTwoStates(12, 13);
                     else if (curChar == 35)
                     {
  -                     if (kind > 20)
  -                        kind = 20;
  +                     if (kind > 19)
  +                        kind = 19;
                     }
                     else if (curChar == 36)
                     {
  -                     if (kind > 15)
  -                        kind = 15;
  +                     if (kind > 14)
  +                        kind = 14;
                     }
                     else if (curChar == 41)
                     {
  @@ -564,16 +532,16 @@
                        jjstateSet[jjnewStateCnt++] = 3;
                     break;
                  case 5:
  -                  if (curChar == 36 && kind > 15)
  -                     kind = 15;
  +                  if (curChar == 36 && kind > 14)
  +                     kind = 14;
                     break;
                  case 6:
                     if (curChar == 42)
                        jjstateSet[jjnewStateCnt++] = 7;
                     break;
                  case 7:
  -                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 18)
  -                     kind = 18;
  +                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 17)
  +                     kind = 17;
                     break;
                  case 8:
                     if (curChar == 42)
  @@ -584,8 +552,8 @@
                        jjstateSet[jjnewStateCnt++] = 8;
                     break;
                  case 10:
  -                  if (curChar == 35 && kind > 20)
  -                     kind = 20;
  +                  if (curChar == 35 && kind > 19)
  +                     kind = 19;
                     break;
                  case 11:
                     if (curChar == 34)
  @@ -596,16 +564,16 @@
                        jjCheckNAddTwoStates(12, 13);
                     break;
                  case 13:
  -                  if (curChar == 34 && kind > 29)
  -                     kind = 29;
  +                  if (curChar == 34 && kind > 28)
  +                     kind = 28;
                     break;
                  case 14:
  -                  if ((0x2400L & l) != 0L && kind > 32)
  -                     kind = 32;
  +                  if ((0x2400L & l) != 0L && kind > 31)
  +                     kind = 31;
                     break;
                  case 15:
  -                  if (curChar == 10 && kind > 32)
  -                     kind = 32;
  +                  if (curChar == 10 && kind > 31)
  +                     kind = 31;
                     break;
                  case 16:
                     if (curChar == 13)
  @@ -614,8 +582,8 @@
                  case 17:
                     if ((0x3ff000000000000L & l) == 0L)
                        break;
  -                  if (kind > 55)
  -                     kind = 55;
  +                  if (kind > 53)
  +                     kind = 53;
                     jjCheckNAdd(17);
                     break;
                  default : break;
  @@ -632,16 +600,16 @@
                  case 0:
                     if ((0x7fffffe07fffffeL & l) != 0L)
                     {
  -                     if (kind > 57)
  -                        kind = 57;
  +                     if (kind > 55)
  +                        kind = 55;
                        jjCheckNAdd(18);
                     }
                     else if (curChar == 92)
                        jjAddStates(3, 4);
                     break;
                  case 7:
  -                  if (kind > 18)
  -                     kind = 18;
  +                  if (kind > 17)
  +                     kind = 17;
                     break;
                  case 12:
                     jjAddStates(5, 6);
  @@ -649,8 +617,8 @@
                  case 18:
                     if ((0x7fffffe07fffffeL & l) == 0L)
                        break;
  -                  if (kind > 57)
  -                     kind = 57;
  +                  if (kind > 55)
  +                     kind = 55;
                     jjCheckNAdd(18);
                     break;
                  case 19:
  @@ -670,8 +638,8 @@
               switch(jjstateSet[--i])
               {
                  case 7:
  -                  if ((jjbitVec0[i2] & l2) != 0L && kind > 18)
  -                     kind = 18;
  +                  if ((jjbitVec0[i2] & l2) != 0L && kind > 17)
  +                     kind = 17;
                     break;
                  case 12:
                     if ((jjbitVec0[i2] & l2) != 0L)
  @@ -699,14 +667,14 @@
      switch (pos)
      {
         case 0:
  -         if ((active0 & 0xa0000L) != 0L)
  +         if ((active0 & 0x50000L) != 0L)
            {
  -            jjmatchedKind = 20;
  +            jjmatchedKind = 19;
               return 3;
            }
  -         if ((active0 & 0x10000L) != 0L)
  +         if ((active0 & 0x8000L) != 0L)
            {
  -            jjmatchedKind = 15;
  +            jjmatchedKind = 14;
               return -1;
            }
            return -1;
  @@ -731,11 +699,11 @@
      switch(curChar)
      {
         case 35:
  -         return jjMoveStringLiteralDfa1_6(0xa0000L);
  +         return jjMoveStringLiteralDfa1_6(0x50000L);
         case 36:
  -         return jjMoveStringLiteralDfa1_6(0x10000L);
  +         return jjMoveStringLiteralDfa1_6(0x8000L);
         case 42:
  -         return jjMoveStringLiteralDfa1_6(0x2000000L);
  +         return jjMoveStringLiteralDfa1_6(0x1000000L);
         default :
            return jjMoveNfa_6(4, 0);
      }
  @@ -750,18 +718,18 @@
      switch(curChar)
      {
         case 33:
  -         if ((active0 & 0x10000L) != 0L)
  -            return jjStopAtPos(1, 16);
  +         if ((active0 & 0x8000L) != 0L)
  +            return jjStopAtPos(1, 15);
            break;
         case 35:
  -         if ((active0 & 0x20000L) != 0L)
  -            return jjStopAtPos(1, 17);
  -         else if ((active0 & 0x2000000L) != 0L)
  -            return jjStopAtPos(1, 25);
  +         if ((active0 & 0x10000L) != 0L)
  +            return jjStopAtPos(1, 16);
  +         else if ((active0 & 0x1000000L) != 0L)
  +            return jjStopAtPos(1, 24);
            break;
         case 42:
  -         if ((active0 & 0x80000L) != 0L)
  -            return jjStartNfaWithStates_6(1, 19, 1);
  +         if ((active0 & 0x40000L) != 0L)
  +            return jjStartNfaWithStates_6(1, 18, 1);
            break;
         default :
            break;
  @@ -790,36 +758,36 @@
                  case 4:
                     if (curChar == 35)
                     {
  -                     if (kind > 20)
  -                        kind = 20;
  +                     if (kind > 19)
  +                        kind = 19;
                     }
                     else if (curChar == 36)
                     {
  -                     if (kind > 15)
  -                        kind = 15;
  +                     if (kind > 14)
  +                        kind = 14;
                     }
                     if (curChar == 35)
                        jjstateSet[jjnewStateCnt++] = 3;
                     break;
                  case 0:
  -                  if (curChar == 36 && kind > 15)
  -                     kind = 15;
  +                  if (curChar == 36 && kind > 14)
  +                     kind = 14;
                     break;
                  case 1:
                     if (curChar == 42)
                        jjstateSet[jjnewStateCnt++] = 2;
                     break;
                  case 2:
  -                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 18)
  -                     kind = 18;
  +                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 17)
  +                     kind = 17;
                     break;
                  case 3:
                     if (curChar == 42)
                        jjstateSet[jjnewStateCnt++] = 1;
                     break;
                  case 5:
  -                  if (curChar == 35 && kind > 20)
  -                     kind = 20;
  +                  if (curChar == 35 && kind > 19)
  +                     kind = 19;
                     break;
                  default : break;
               }
  @@ -837,8 +805,8 @@
                        jjAddStates(7, 8);
                     break;
                  case 2:
  -                  if (kind > 18)
  -                     kind = 18;
  +                  if (kind > 17)
  +                     kind = 17;
                     break;
                  default : break;
               }
  @@ -853,8 +821,8 @@
               switch(jjstateSet[--i])
               {
                  case 2:
  -                  if ((jjbitVec0[i2] & l2) != 0L && kind > 18)
  -                     kind = 18;
  +                  if ((jjbitVec0[i2] & l2) != 0L && kind > 17)
  +                     kind = 17;
                     break;
                  default : break;
               }
  @@ -873,280 +841,197 @@
         catch(java.io.IOException e) { return curPos; }
      }
   }
  -private final int jjStopStringLiteralDfa_4(int pos, long active0)
  +private final int jjStopStringLiteralDfa_5(int pos, long active0)
   {
      switch (pos)
      {
         case 0:
  -         if ((active0 & 0xa0000L) != 0L)
  +         if ((active0 & 0x50000L) != 0L)
            {
  -            jjmatchedKind = 20;
  +            jjmatchedKind = 19;
               return 3;
  -         }
  -         if ((active0 & 0x10000L) != 0L)
  -         {
  -            jjmatchedKind = 15;
  -            return -1;
            }
  -         if ((active0 & 0x26000000000000L) != 0L)
  +         if ((active0 & 0x60000000L) != 0L)
            {
  -            jjmatchedKind = 57;
  -            return 14;
  +            jjmatchedKind = 59;
  +            return 10;
            }
  -         if ((active0 & 0x18000000000000L) != 0L)
  +         if ((active0 & 0x8000L) != 0L)
            {
  -            jjmatchedKind = 57;
  -            return 11;
  +            jjmatchedKind = 14;
  +            return -1;
            }
            return -1;
         case 1:
  -         if ((active0 & 0x4000000000000L) != 0L)
  -            return 14;
  -         if ((active0 & 0x10000L) != 0L)
  +         if ((active0 & 0x40000L) != 0L)
  +            return 1;
  +         if ((active0 & 0x8000L) != 0L)
            {
               if (jjmatchedPos == 0)
               {
  -               jjmatchedKind = 15;
  +               jjmatchedKind = 14;
                  jjmatchedPos = 0;
               }
               return -1;
            }
  -         if ((active0 & 0x80000L) != 0L)
  -            return 1;
  -         if ((active0 & 0x3a000000000000L) != 0L)
  +         if ((active0 & 0x60000000L) != 0L)
            {
  -            jjmatchedKind = 57;
  +            jjmatchedKind = 59;
               jjmatchedPos = 1;
  -            return 14;
  +            return 10;
            }
            return -1;
         case 2:
  -         if ((active0 & 0x3a000000000000L) != 0L)
  +         if ((active0 & 0x60000000L) != 0L)
            {
  -            jjmatchedKind = 57;
  +            jjmatchedKind = 59;
               jjmatchedPos = 2;
  -            return 14;
  +            return 10;
            }
            return -1;
         case 3:
  -         if ((active0 & 0x38000000000000L) != 0L)
  -            return 14;
  -         if ((active0 & 0x2000000000000L) != 0L)
  -         {
  -            if (jjmatchedPos != 3)
  -            {
  -               jjmatchedKind = 57;
  -               jjmatchedPos = 3;
  -            }
  -            return 14;
  -         }
  -         return -1;
  -      case 4:
  -         if ((active0 & 0xa000000000000L) != 0L)
  -         {
  -            jjmatchedKind = 57;
  -            jjmatchedPos = 4;
  -            return 14;
  -         }
  -         return -1;
  -      case 5:
  -         if ((active0 & 0x2000000000000L) != 0L)
  +         if ((active0 & 0x20000000L) != 0L)
  +            return 10;
  +         if ((active0 & 0x40000000L) != 0L)
            {
  -            jjmatchedKind = 57;
  -            jjmatchedPos = 5;
  -            return 14;
  +            jjmatchedKind = 59;
  +            jjmatchedPos = 3;
  +            return 10;
            }
  -         if ((active0 & 0x8000000000000L) != 0L)
  -            return 14;
            return -1;
         default :
            return -1;
      }
   }
  -private final int jjStartNfa_4(int pos, long active0)
  +private final int jjStartNfa_5(int pos, long active0)
   {
  -   return jjMoveNfa_4(jjStopStringLiteralDfa_4(pos, active0), pos + 1);
  +   return jjMoveNfa_5(jjStopStringLiteralDfa_5(pos, active0), pos + 1);
   }
  -private final int jjStartNfaWithStates_4(int pos, int kind, int state)
  +private final int jjStartNfaWithStates_5(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_4(state, pos + 1);
  +   return jjMoveNfa_5(state, pos + 1);
   }
  -private final int jjMoveStringLiteralDfa0_4()
  +private final int jjMoveStringLiteralDfa0_5()
   {
      switch(curChar)
      {
         case 35:
  -         return jjMoveStringLiteralDfa1_4(0xa0000L);
  +         return jjMoveStringLiteralDfa1_5(0x50000L);
         case 36:
  -         return jjMoveStringLiteralDfa1_4(0x10000L);
  -      case 101:
  -         return jjMoveStringLiteralDfa1_4(0x18000000000000L);
  -      case 105:
  -         return jjMoveStringLiteralDfa1_4(0x6000000000000L);
  -      case 115:
  -         return jjMoveStringLiteralDfa1_4(0x20000000000000L);
  +         return jjMoveStringLiteralDfa1_5(0x8000L);
  +      case 102:
  +         return jjMoveStringLiteralDfa1_5(0x40000000L);
  +      case 116:
  +         return jjMoveStringLiteralDfa1_5(0x20000000L);
  +      case 123:
  +         return jjStopAtPos(0, 61);
  +      case 125:
  +         return jjStopAtPos(0, 62);
         default :
  -         return jjMoveNfa_4(4, 0);
  +         return jjMoveNfa_5(4, 0);
      }
   }
  -private final int jjMoveStringLiteralDfa1_4(long active0)
  +private final int jjMoveStringLiteralDfa1_5(long active0)
   {
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_4(0, active0);
  +      jjStopStringLiteralDfa_5(0, active0);
         return 1;
      }
      switch(curChar)
      {
         case 33:
  -         if ((active0 & 0x10000L) != 0L)
  -            return jjStopAtPos(1, 16);
  +         if ((active0 & 0x8000L) != 0L)
  +            return jjStopAtPos(1, 15);
            break;
         case 35:
  -         if ((active0 & 0x20000L) != 0L)
  -            return jjStopAtPos(1, 17);
  +         if ((active0 & 0x10000L) != 0L)
  +            return jjStopAtPos(1, 16);
            break;
         case 42:
  -         if ((active0 & 0x80000L) != 0L)
  -            return jjStartNfaWithStates_4(1, 19, 1);
  -         break;
  -      case 102:
  -         if ((active0 & 0x4000000000000L) != 0L)
  -            return jjStartNfaWithStates_4(1, 50, 14);
  +         if ((active0 & 0x40000L) != 0L)
  +            return jjStartNfaWithStates_5(1, 18, 1);
            break;
  -      case 108:
  -         return jjMoveStringLiteralDfa2_4(active0, 0x18000000000000L);
  -      case 110:
  -         return jjMoveStringLiteralDfa2_4(active0, 0x2000000000000L);
  -      case 116:
  -         return jjMoveStringLiteralDfa2_4(active0, 0x20000000000000L);
  +      case 97:
  +         return jjMoveStringLiteralDfa2_5(active0, 0x40000000L);
  +      case 114:
  +         return jjMoveStringLiteralDfa2_5(active0, 0x20000000L);
         default :
            break;
      }
  -   return jjStartNfa_4(0, active0);
  +   return jjStartNfa_5(0, active0);
   }
  -private final int jjMoveStringLiteralDfa2_4(long old0, long active0)
  +private final int jjMoveStringLiteralDfa2_5(long old0, long active0)
   {
      if (((active0 &= old0)) == 0L)
  -      return jjStartNfa_4(0, old0); 
  +      return jjStartNfa_5(0, old0); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_4(1, active0);
  +      jjStopStringLiteralDfa_5(1, active0);
         return 2;
      }
      switch(curChar)
      {
  -      case 99:
  -         return jjMoveStringLiteralDfa3_4(active0, 0x2000000000000L);
  -      case 111:
  -         return jjMoveStringLiteralDfa3_4(active0, 0x20000000000000L);
  -      case 115:
  -         return jjMoveStringLiteralDfa3_4(active0, 0x18000000000000L);
  +      case 108:
  +         return jjMoveStringLiteralDfa3_5(active0, 0x40000000L);
  +      case 117:
  +         return jjMoveStringLiteralDfa3_5(active0, 0x20000000L);
         default :
            break;
      }
  -   return jjStartNfa_4(1, active0);
  +   return jjStartNfa_5(1, active0);
   }
  -private final int jjMoveStringLiteralDfa3_4(long old0, long active0)
  +private final int jjMoveStringLiteralDfa3_5(long old0, long active0)
   {
      if (((active0 &= old0)) == 0L)
  -      return jjStartNfa_4(1, old0); 
  +      return jjStartNfa_5(1, old0); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_4(2, active0);
  +      jjStopStringLiteralDfa_5(2, active0);
         return 3;
      }
      switch(curChar)
      {
         case 101:
  -         if ((active0 & 0x10000000000000L) != 0L)
  -         {
  -            jjmatchedKind = 52;
  -            jjmatchedPos = 3;
  -         }
  -         return jjMoveStringLiteralDfa4_4(active0, 0x8000000000000L);
  -      case 108:
  -         return jjMoveStringLiteralDfa4_4(active0, 0x2000000000000L);
  -      case 112:
  -         if ((active0 & 0x20000000000000L) != 0L)
  -            return jjStartNfaWithStates_4(3, 53, 14);
  +         if ((active0 & 0x20000000L) != 0L)
  +            return jjStartNfaWithStates_5(3, 29, 10);
            break;
  +      case 115:
  +         return jjMoveStringLiteralDfa4_5(active0, 0x40000000L);
         default :
            break;
      }
  -   return jjStartNfa_4(2, active0);
  +   return jjStartNfa_5(2, active0);
   }
  -private final int jjMoveStringLiteralDfa4_4(long old0, long active0)
  +private final int jjMoveStringLiteralDfa4_5(long old0, long active0)
   {
      if (((active0 &= old0)) == 0L)
  -      return jjStartNfa_4(2, old0); 
  +      return jjStartNfa_5(2, old0); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_4(3, active0);
  +      jjStopStringLiteralDfa_5(3, active0);
         return 4;
      }
      switch(curChar)
      {
  -      case 105:
  -         return jjMoveStringLiteralDfa5_4(active0, 0x8000000000000L);
  -      case 117:
  -         return jjMoveStringLiteralDfa5_4(active0, 0x2000000000000L);
  -      default :
  -         break;
  -   }
  -   return jjStartNfa_4(3, active0);
  -}
  -private final int jjMoveStringLiteralDfa5_4(long old0, long active0)
  -{
  -   if (((active0 &= old0)) == 0L)
  -      return jjStartNfa_4(3, old0); 
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_4(4, active0);
  -      return 5;
  -   }
  -   switch(curChar)
  -   {
  -      case 100:
  -         return jjMoveStringLiteralDfa6_4(active0, 0x2000000000000L);
  -      case 102:
  -         if ((active0 & 0x8000000000000L) != 0L)
  -            return jjStartNfaWithStates_4(5, 51, 14);
  -         break;
  -      default :
  -         break;
  -   }
  -   return jjStartNfa_4(4, active0);
  -}
  -private final int jjMoveStringLiteralDfa6_4(long old0, long active0)
  -{
  -   if (((active0 &= old0)) == 0L)
  -      return jjStartNfa_4(4, old0); 
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_4(5, active0);
  -      return 6;
  -   }
  -   switch(curChar)
  -   {
         case 101:
  -         if ((active0 & 0x2000000000000L) != 0L)
  -            return jjStartNfaWithStates_4(6, 49, 14);
  +         if ((active0 & 0x40000000L) != 0L)
  +            return jjStartNfaWithStates_5(4, 30, 10);
            break;
         default :
            break;
      }
  -   return jjStartNfa_4(5, active0);
  +   return jjStartNfa_5(3, active0);
   }
  -private final int jjMoveNfa_4(int startState, int curPos)
  +private final int jjMoveNfa_5(int startState, int curPos)
   {
      int[] nextStates;
      int startsAt = 0;
  -   jjnewStateCnt = 16;
  +   jjnewStateCnt = 14;
      int i = 1;
      jjstateSet[0] = startState;
      int j, kind = 0x7fffffff;
  @@ -1162,67 +1047,65 @@
               switch(jjstateSet[--i])
               {
                  case 4:
  -                  if ((0x3ff000000000000L & l) != 0L)
  -                  {
  -                     if (kind > 55)
  -                        kind = 55;
  -                     jjCheckNAdd(13);
  -                  }
  +                  if (curChar == 46)
  +                     jjstateSet[jjnewStateCnt++] = 12;
  +                  else if (curChar == 34)
  +                     jjCheckNAddTwoStates(7, 8);
                     else if (curChar == 35)
                     {
  -                     if (kind > 20)
  -                        kind = 20;
  +                     if (kind > 19)
  +                        kind = 19;
                     }
                     else if (curChar == 36)
                     {
  -                     if (kind > 15)
  -                        kind = 15;
  +                     if (kind > 14)
  +                        kind = 14;
                     }
                     if (curChar == 35)
                        jjstateSet[jjnewStateCnt++] = 3;
                     break;
                  case 0:
  -                  if (curChar == 36 && kind > 15)
  -                     kind = 15;
  +                  if (curChar == 36 && kind > 14)
  +                     kind = 14;
                     break;
                  case 1:
                     if (curChar == 42)
                        jjstateSet[jjnewStateCnt++] = 2;
                     break;
                  case 2:
  -                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 18)
  -                     kind = 18;
  +                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 17)
  +                     kind = 17;
                     break;
                  case 3:
                     if (curChar == 42)
                        jjstateSet[jjnewStateCnt++] = 1;
                     break;
                  case 5:
  -                  if (curChar == 35 && kind > 20)
  -                     kind = 20;
  +                  if (curChar == 35 && kind > 19)
  +                     kind = 19;
  +                  break;
  +               case 6:
  +                  if (curChar == 34)
  +                     jjCheckNAddTwoStates(7, 8);
                     break;
                  case 7:
  -                  if ((0x100000200L & l) != 0L)
  -                     jjAddStates(9, 11);
  +                  if ((0xfffffffbffffdbffL & l) != 0L)
  +                     jjCheckNAddTwoStates(7, 8);
                     break;
                  case 8:
  -                  if ((0x2400L & l) != 0L && kind > 48)
  -                     kind = 48;
  -                  break;
  -               case 9:
  -                  if (curChar == 10 && kind > 48)
  -                     kind = 48;
  +                  if (curChar == 34 && kind > 28)
  +                     kind = 28;
                     break;
                  case 10:
  -                  if (curChar == 13)
  -                     jjstateSet[jjnewStateCnt++] = 9;
  -                  break;
  -               case 13:
  -                  if ((0x3ff000000000000L & l) == 0L)
  +                  if ((0x3ff200000000000L & l) == 0L)
                        break;
  -                  if (kind > 55)
  -                     kind = 55;
  -                  jjCheckNAdd(13);
  +                  if (kind > 59)
  +                     kind = 59;
  +                  jjstateSet[jjnewStateCnt++] = 10;
  +                  break;
  +               case 11:
  +                  if (curChar == 46)
  +                     jjstateSet[jjnewStateCnt++] = 12;
                     break;
                  default : break;
               }
  @@ -1235,51 +1118,42 @@
            {
               switch(jjstateSet[--i])
               {
  -               case 11:
  +               case 4:
                     if ((0x7fffffe07fffffeL & l) != 0L)
                     {
  -                     if (kind > 57)
  -                        kind = 57;
  -                     jjCheckNAdd(14);
  -                  }
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 6;
  -                  break;
  -               case 4:
  -                  if ((0x7fffffe07fffffeL & l) != 0L)
  -                  {
  -                     if (kind > 57)
  -                        kind = 57;
  -                     jjCheckNAdd(14);
  +                     if (kind > 59)
  +                        kind = 59;
  +                     jjCheckNAdd(10);
                     }
                     else if (curChar == 92)
                        jjAddStates(7, 8);
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 11;
                     break;
                  case 2:
  -                  if (kind > 18)
  -                     kind = 18;
  +                  if (kind > 17)
  +                     kind = 17;
                     break;
  -               case 6:
  -                  if (curChar != 100)
  -                     break;
  -                  if (kind > 48)
  -                     kind = 48;
  -                  jjAddStates(9, 11);
  -                  break;
  -               case 12:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 11;
  +               case 7:
  +                  jjAddStates(9, 10);
                     break;
  -               case 14:
  +               case 9:
                     if ((0x7fffffe07fffffeL & l) == 0L)
                        break;
  -                  if (kind > 57)
  -                     kind = 57;
  -                  jjCheckNAdd(14);
  +                  if (kind > 59)
  +                     kind = 59;
  +                  jjCheckNAdd(10);
                     break;
  -               case 15:
  +               case 10:
  +                  if ((0x7fffffe87fffffeL & l) == 0L)
  +                     break;
  +                  if (kind > 59)
  +                     kind = 59;
  +                  jjCheckNAdd(10);
  +                  break;
  +               case 12:
  +                  if ((0x7fffffe07fffffeL & l) != 0L && kind > 60)
  +                     kind = 60;
  +                  break;
  +               case 13:
                     if (curChar == 92)
                        jjAddStates(7, 8);
                     break;
  @@ -1296,8 +1170,12 @@
               switch(jjstateSet[--i])
               {
                  case 2:
  -                  if ((jjbitVec0[i2] & l2) != 0L && kind > 18)
  -                     kind = 18;
  +                  if ((jjbitVec0[i2] & l2) != 0L && kind > 17)
  +                     kind = 17;
  +                  break;
  +               case 7:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(9, 10);
                     break;
                  default : break;
               }
  @@ -1310,348 +1188,209 @@
            kind = 0x7fffffff;
         }
         ++curPos;
  -      if ((i = jjnewStateCnt) == (startsAt = 16 - (jjnewStateCnt = startsAt)))
  +      if ((i = jjnewStateCnt) == (startsAt = 14 - (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)
  +private final int jjStopStringLiteralDfa_1(int pos, long active0)
   {
      switch (pos)
      {
         case 0:
  -         if ((active0 & 0x203f80L) != 0L)
  -            return 13;
  -         if ((active0 & 0x10000L) != 0L)
  +         if ((active0 & 0x50000L) != 0L)
            {
  -            jjmatchedKind = 15;
  -            return -1;
  +            jjmatchedKind = 19;
  +            return 3;
            }
  -         if ((active0 & 0xa0000L) != 0L)
  +         if ((active0 & 0x60000000L) != 0L)
            {
  -            jjmatchedKind = 20;
  -            return 11;
  +            jjmatchedKind = 59;
  +            return 10;
            }
  -         return -1;
  -      case 1:
  -         if ((active0 & 0x3f80L) != 0L)
  +         if ((active0 & 0x8000L) != 0L)
            {
  -            jjmatchedKind = 20;
  -            jjmatchedPos = 1;
  +            jjmatchedKind = 14;
               return -1;
            }
  -         if ((active0 & 0x10000L) != 0L)
  +         return -1;
  +      case 1:
  +         if ((active0 & 0x40000L) != 0L)
  +            return 1;
  +         if ((active0 & 0x8000L) != 0L)
            {
               if (jjmatchedPos == 0)
               {
  -               jjmatchedKind = 15;
  +               jjmatchedKind = 14;
                  jjmatchedPos = 0;
               }
               return -1;
  -         }
  -         if ((active0 & 0x80000L) != 0L)
  -            return 9;
  -         return -1;
  -      case 2:
  -         if ((active0 & 0x3f80L) != 0L)
  -         {
  -            if (jjmatchedPos < 1)
  -            {
  -               jjmatchedKind = 20;
  -               jjmatchedPos = 1;
  -            }
  -            return -1;
  -         }
  -         return -1;
  -      case 3:
  -         if ((active0 & 0x3f80L) != 0L)
  -         {
  -            if (jjmatchedPos < 1)
  -            {
  -               jjmatchedKind = 20;
  -               jjmatchedPos = 1;
  -            }
  -            return -1;
  -         }
  -         return -1;
  -      case 4:
  -         if ((active0 & 0x3e80L) != 0L)
  -         {
  -            if (jjmatchedPos < 1)
  -            {
  -               jjmatchedKind = 20;
  -               jjmatchedPos = 1;
  -            }
  -            return -1;
            }
  -         return -1;
  -      case 5:
  -         if ((active0 & 0x3c00L) != 0L)
  +         if ((active0 & 0x60000000L) != 0L)
            {
  -            if (jjmatchedPos < 1)
  -            {
  -               jjmatchedKind = 20;
  -               jjmatchedPos = 1;
  -            }
  -            return -1;
  +            jjmatchedKind = 59;
  +            jjmatchedPos = 1;
  +            return 10;
            }
            return -1;
  -      case 6:
  -         if ((active0 & 0xc00L) != 0L)
  +      case 2:
  +         if ((active0 & 0x60000000L) != 0L)
            {
  -            if (jjmatchedPos < 1)
  -            {
  -               jjmatchedKind = 20;
  -               jjmatchedPos = 1;
  -            }
  -            return -1;
  +            jjmatchedKind = 59;
  +            jjmatchedPos = 2;
  +            return 10;
            }
            return -1;
  -      case 7:
  -         if ((active0 & 0xc00L) != 0L)
  +      case 3:
  +         if ((active0 & 0x20000000L) != 0L)
  +            return 10;
  +         if ((active0 & 0x40000000L) != 0L)
            {
  -            if (jjmatchedPos < 1)
  -            {
  -               jjmatchedKind = 20;
  -               jjmatchedPos = 1;
  -            }
  -            return -1;
  +            jjmatchedKind = 59;
  +            jjmatchedPos = 3;
  +            return 10;
            }
            return -1;
         default :
            return -1;
      }
   }
  -private final int jjStartNfa_3(int pos, long active0)
  +private final int jjStartNfa_1(int pos, long active0)
   {
  -   return jjMoveNfa_3(jjStopStringLiteralDfa_3(pos, active0), pos + 1);
  +   return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0), pos + 1);
   }
  -private final int jjStartNfaWithStates_3(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_3(state, pos + 1);
  +   return jjMoveNfa_1(state, pos + 1);
   }
  -private final int jjMoveStringLiteralDfa0_3()
  +private final int jjMoveStringLiteralDfa0_1()
   {
      switch(curChar)
      {
         case 35:
  -         return jjMoveStringLiteralDfa1_3(0xa0000L);
  +         return jjMoveStringLiteralDfa1_1(0x50000L);
         case 36:
  -         return jjMoveStringLiteralDfa1_3(0x10000L);
  -      case 92:
  -         jjmatchedKind = 21;
  -         return jjMoveStringLiteralDfa1_3(0x3f80L);
  +         return jjMoveStringLiteralDfa1_1(0x8000L);
  +      case 40:
  +         return jjStopAtPos(0, 4);
  +      case 91:
  +         return jjStopAtPos(0, 1);
  +      case 93:
  +         return jjStopAtPos(0, 2);
  +      case 102:
  +         return jjMoveStringLiteralDfa1_1(0x40000000L);
  +      case 116:
  +         return jjMoveStringLiteralDfa1_1(0x20000000L);
  +      case 123:
  +         return jjStopAtPos(0, 61);
  +      case 125:
  +         return jjStopAtPos(0, 62);
         default :
  -         return jjMoveNfa_3(8, 0);
  +         return jjMoveNfa_1(4, 0);
      }
   }
  -private final int jjMoveStringLiteralDfa1_3(long active0)
  +private final int jjMoveStringLiteralDfa1_1(long active0)
   {
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_3(0, active0);
  +      jjStopStringLiteralDfa_1(0, active0);
         return 1;
      }
      switch(curChar)
      {
         case 33:
  +         if ((active0 & 0x8000L) != 0L)
  +            return jjStopAtPos(1, 15);
  +         break;
  +      case 35:
            if ((active0 & 0x10000L) != 0L)
               return jjStopAtPos(1, 16);
            break;
  -      case 35:
  -         if ((active0 & 0x20000L) != 0L)
  -            return jjStopAtPos(1, 17);
  -         return jjMoveStringLiteralDfa2_3(active0, 0x3f80L);
         case 42:
  -         if ((active0 & 0x80000L) != 0L)
  -            return jjStartNfaWithStates_3(1, 19, 9);
  +         if ((active0 & 0x40000L) != 0L)
  +            return jjStartNfaWithStates_1(1, 18, 1);
            break;
  +      case 97:
  +         return jjMoveStringLiteralDfa2_1(active0, 0x40000000L);
  +      case 114:
  +         return jjMoveStringLiteralDfa2_1(active0, 0x20000000L);
         default :
            break;
      }
  -   return jjStartNfa_3(0, active0);
  +   return jjStartNfa_1(0, active0);
   }
  -private final int jjMoveStringLiteralDfa2_3(long old0, long active0)
  +private final int jjMoveStringLiteralDfa2_1(long old0, long active0)
   {
      if (((active0 &= old0)) == 0L)
  -      return jjStartNfa_3(0, old0); 
  +      return jjStartNfa_1(0, old0); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_3(1, active0);
  +      jjStopStringLiteralDfa_1(1, active0);
         return 2;
      }
      switch(curChar)
      {
  -      case 101:
  -         return jjMoveStringLiteralDfa3_3(active0, 0x1a00L);
  -      case 105:
  -         return jjMoveStringLiteralDfa3_3(active0, 0x500L);
  -      case 115:
  -         return jjMoveStringLiteralDfa3_3(active0, 0x2080L);
  +      case 108:
  +         return jjMoveStringLiteralDfa3_1(active0, 0x40000000L);
  +      case 117:
  +         return jjMoveStringLiteralDfa3_1(active0, 0x20000000L);
         default :
            break;
      }
  -   return jjStartNfa_3(1, active0);
  +   return jjStartNfa_1(1, active0);
   }
  -private final int jjMoveStringLiteralDfa3_3(long old0, long active0)
  +private final int jjMoveStringLiteralDfa3_1(long old0, long active0)
   {
      if (((active0 &= old0)) == 0L)
  -      return jjStartNfa_3(1, old0); 
  +      return jjStartNfa_1(1, old0); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_3(2, active0);
  +      jjStopStringLiteralDfa_1(2, active0);
         return 3;
      }
      switch(curChar)
      {
         case 101:
  -         return jjMoveStringLiteralDfa4_3(active0, 0x80L);
  -      case 102:
  -         if ((active0 & 0x100L) != 0L)
  -            return jjStopAtPos(3, 8);
  -         break;
  -      case 108:
  -         return jjMoveStringLiteralDfa4_3(active0, 0x1800L);
  -      case 110:
  -         return jjMoveStringLiteralDfa4_3(active0, 0x600L);
  -      case 116:
  -         return jjMoveStringLiteralDfa4_3(active0, 0x2000L);
  -      default :
  -         break;
  -   }
  -   return jjStartNfa_3(2, active0);
  -}
  -private final int jjMoveStringLiteralDfa4_3(long old0, long active0)
  -{
  -   if (((active0 &= old0)) == 0L)
  -      return jjStartNfa_3(2, old0); 
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_3(3, active0);
  -      return 4;
  -   }
  -   switch(curChar)
  -   {
  -      case 99:
  -         return jjMoveStringLiteralDfa5_3(active0, 0x400L);
  -      case 100:
  -         if ((active0 & 0x200L) != 0L)
  -            return jjStopAtPos(4, 9);
  +         if ((active0 & 0x20000000L) != 0L)
  +            return jjStartNfaWithStates_1(3, 29, 10);
            break;
  -      case 111:
  -         return jjMoveStringLiteralDfa5_3(active0, 0x2000L);
         case 115:
  -         return jjMoveStringLiteralDfa5_3(active0, 0x1800L);
  -      case 116:
  -         if ((active0 & 0x80L) != 0L)
  -            return jjStopAtPos(4, 7);
  -         break;
  -      default :
  -         break;
  -   }
  -   return jjStartNfa_3(3, active0);
  -}
  -private final int jjMoveStringLiteralDfa5_3(long old0, long active0)
  -{
  -   if (((active0 &= old0)) == 0L)
  -      return jjStartNfa_3(3, old0); 
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_3(4, active0);
  -      return 5;
  -   }
  -   switch(curChar)
  -   {
  -      case 101:
  -         if ((active0 & 0x1000L) != 0L)
  -         {
  -            jjmatchedKind = 12;
  -            jjmatchedPos = 5;
  -         }
  -         return jjMoveStringLiteralDfa6_3(active0, 0x800L);
  -      case 108:
  -         return jjMoveStringLiteralDfa6_3(active0, 0x400L);
  -      case 112:
  -         if ((active0 & 0x2000L) != 0L)
  -            return jjStopAtPos(5, 13);
  -         break;
  -      default :
  -         break;
  -   }
  -   return jjStartNfa_3(4, active0);
  -}
  -private final int jjMoveStringLiteralDfa6_3(long old0, long active0)
  -{
  -   if (((active0 &= old0)) == 0L)
  -      return jjStartNfa_3(4, old0); 
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_3(5, active0);
  -      return 6;
  -   }
  -   switch(curChar)
  -   {
  -      case 105:
  -         return jjMoveStringLiteralDfa7_3(active0, 0x800L);
  -      case 117:
  -         return jjMoveStringLiteralDfa7_3(active0, 0x400L);
  -      default :
  -         break;
  -   }
  -   return jjStartNfa_3(5, active0);
  -}
  -private final int jjMoveStringLiteralDfa7_3(long old0, long active0)
  -{
  -   if (((active0 &= old0)) == 0L)
  -      return jjStartNfa_3(5, old0); 
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_3(6, active0);
  -      return 7;
  -   }
  -   switch(curChar)
  -   {
  -      case 100:
  -         return jjMoveStringLiteralDfa8_3(active0, 0x400L);
  -      case 102:
  -         if ((active0 & 0x800L) != 0L)
  -            return jjStopAtPos(7, 11);
  -         break;
  +         return jjMoveStringLiteralDfa4_1(active0, 0x40000000L);
         default :
            break;
      }
  -   return jjStartNfa_3(6, active0);
  +   return jjStartNfa_1(2, active0);
   }
  -private final int jjMoveStringLiteralDfa8_3(long old0, long active0)
  +private final int jjMoveStringLiteralDfa4_1(long old0, long active0)
   {
      if (((active0 &= old0)) == 0L)
  -      return jjStartNfa_3(6, old0); 
  +      return jjStartNfa_1(2, old0); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_3(7, active0);
  -      return 8;
  +      jjStopStringLiteralDfa_1(3, active0);
  +      return 4;
      }
      switch(curChar)
      {
         case 101:
  -         if ((active0 & 0x400L) != 0L)
  -            return jjStopAtPos(8, 10);
  +         if ((active0 & 0x40000000L) != 0L)
  +            return jjStartNfaWithStates_1(4, 30, 10);
            break;
         default :
            break;
      }
  -   return jjStartNfa_3(7, active0);
  +   return jjStartNfa_1(3, active0);
   }
  -private final int jjMoveNfa_3(int startState, int curPos)
  +private final int jjMoveNfa_1(int startState, int curPos)
   {
      int[] nextStates;
      int startsAt = 0;
  -   jjnewStateCnt = 13;
  +   jjnewStateCnt = 14;
      int i = 1;
      jjstateSet[0] = startState;
      int j, kind = 0x7fffffff;
  @@ -1666,75 +1405,67 @@
            {
               switch(jjstateSet[--i])
               {
  -               case 11:
  -                  if (curChar == 42)
  -                     jjstateSet[jjnewStateCnt++] = 9;
  -                  break;
  -               case 8:
  -                  if ((0xffffffe7ffffffffL & l) != 0L)
  -                  {
  -                     if (kind > 22)
  -                        kind = 22;
  -                     jjCheckNAdd(7);
  -                  }
  -                  else if (curChar == 35)
  -                     jjCheckNAddTwoStates(3, 11);
  -                  else if (curChar == 36)
  -                  {
  -                     if (kind > 15)
  -                        kind = 15;
  -                  }
  -                  if ((0x100000200L & l) != 0L)
  -                     jjCheckNAddTwoStates(0, 4);
  +               case 4:
  +                  if (curChar == 46)
  +                     jjstateSet[jjnewStateCnt++] = 12;
  +                  else if (curChar == 34)
  +                     jjCheckNAddTwoStates(7, 8);
                     else if (curChar == 35)
  -                  {
  -                     if (kind > 20)
  -                        kind = 20;
  -                  }
  -                  break;
  -               case 13:
  -                  if (curChar == 35)
                     {
  -                     if (kind > 20)
  -                        kind = 20;
  +                     if (kind > 19)
  +                        kind = 19;
                     }
                     else if (curChar == 36)
                     {
  -                     if (kind > 15)
  -                        kind = 15;
  +                     if (kind > 14)
  +                        kind = 14;
                     }
  +                  if (curChar == 35)
  +                     jjstateSet[jjnewStateCnt++] = 3;
                     break;
                  case 0:
  -                  if ((0x100000200L & l) != 0L)
  -                     jjCheckNAddTwoStates(0, 4);
  +                  if (curChar == 36 && kind > 14)
  +                     kind = 14;
                     break;
  -               case 4:
  -                  if (curChar == 35)
  -                     jjCheckNAdd(3);
  +               case 1:
  +                  if (curChar == 42)
  +                     jjstateSet[jjnewStateCnt++] = 2;
  +                  break;
  +               case 2:
  +                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 17)
  +                     kind = 17;
  +                  break;
  +               case 3:
  +                  if (curChar == 42)
  +                     jjstateSet[jjnewStateCnt++] = 1;
                     break;
                  case 5:
  -                  if (curChar == 36 && kind > 15)
  -                     kind = 15;
  +                  if (curChar == 35 && kind > 19)
  +                     kind = 19;
                     break;
                  case 6:
  -                  if (curChar == 35 && kind > 20)
  -                     kind = 20;
  +                  if (curChar == 34)
  +                     jjCheckNAddTwoStates(7, 8);
                     break;
                  case 7:
  -                  if ((0xffffffe7ffffffffL & l) == 0L)
  -                     break;
  -                  if (kind > 22)
  -                     kind = 22;
  -                  jjCheckNAdd(7);
  +                  if ((0xfffffffbffffdbffL & l) != 0L)
  +                     jjCheckNAddTwoStates(7, 8);
                     break;
  -               case 9:
  -                  if (curChar == 42)
  -                     jjstateSet[jjnewStateCnt++] = 10;
  +               case 8:
  +                  if (curChar == 34 && kind > 28)
  +                     kind = 28;
                     break;
                  case 10:
  -                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 18)
  -                     kind = 18;
  +                  if ((0x3ff200000000000L & l) == 0L)
  +                     break;
  +                  if (kind > 59)
  +                     kind = 59;
  +                  jjstateSet[jjnewStateCnt++] = 10;
                     break;
  +               case 11:
  +                  if (curChar == 46)
  +                     jjstateSet[jjnewStateCnt++] = 12;
  +                  break;
                  default : break;
               }
            } while(i != startsAt);
  @@ -1746,43 +1477,44 @@
            {
               switch(jjstateSet[--i])
               {
  -               case 11:
  -               case 3:
  -                  if (curChar == 115)
  -                     jjstateSet[jjnewStateCnt++] = 2;
  -                  break;
  -               case 8:
  -                  if ((0xffffffffefffffffL & l) != 0L)
  +               case 4:
  +                  if ((0x7fffffe07fffffeL & l) != 0L)
                     {
  -                     if (kind > 22)
  -                        kind = 22;
  -                     jjCheckNAdd(7);
  +                     if (kind > 59)
  +                        kind = 59;
  +                     jjCheckNAdd(10);
                     }
                     else if (curChar == 92)
  -                     jjAddStates(12, 13);
  -                  break;
  -               case 1:
  -                  if (curChar == 116 && kind > 14)
  -                     kind = 14;
  +                     jjAddStates(7, 8);
                     break;
                  case 2:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 1;
  +                  if (kind > 17)
  +                     kind = 17;
                     break;
                  case 7:
  -                  if ((0xffffffffefffffffL & l) == 0L)
  +                  jjAddStates(9, 10);
  +                  break;
  +               case 9:
  +                  if ((0x7fffffe07fffffeL & l) == 0L)
                        break;
  -                  if (kind > 22)
  -                     kind = 22;
  -                  jjCheckNAdd(7);
  +                  if (kind > 59)
  +                     kind = 59;
  +                  jjCheckNAdd(10);
                     break;
                  case 10:
  -                  if (kind > 18)
  -                     kind = 18;
  +                  if ((0x7fffffe87fffffeL & l) == 0L)
  +                     break;
  +                  if (kind > 59)
  +                     kind = 59;
  +                  jjCheckNAdd(10);
                     break;
                  case 12:
  +                  if ((0x7fffffe07fffffeL & l) != 0L && kind > 60)
  +                     kind = 60;
  +                  break;
  +               case 13:
                     if (curChar == 92)
  -                     jjAddStates(12, 13);
  +                     jjAddStates(7, 8);
                     break;
                  default : break;
               }
  @@ -1796,17 +1528,13 @@
            {
               switch(jjstateSet[--i])
               {
  -               case 8:
  -               case 7:
  -                  if ((jjbitVec0[i2] & l2) == 0L)
  -                     break;
  -                  if (kind > 22)
  -                     kind = 22;
  -                  jjCheckNAdd(7);
  +               case 2:
  +                  if ((jjbitVec0[i2] & l2) != 0L && kind > 17)
  +                     kind = 17;
                     break;
  -               case 10:
  -                  if ((jjbitVec0[i2] & l2) != 0L && kind > 18)
  -                     kind = 18;
  +               case 7:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(9, 10);
                     break;
                  default : break;
               }
  @@ -1819,7 +1547,7 @@
            kind = 0x7fffffff;
         }
         ++curPos;
  -      if ((i = jjnewStateCnt) == (startsAt = 13 - (jjnewStateCnt = startsAt)))
  +      if ((i = jjnewStateCnt) == (startsAt = 14 - (jjnewStateCnt = startsAt)))
            return curPos;
         try { curChar = input_stream.readChar(); }
         catch(java.io.IOException e) { return curPos; }
  @@ -1830,14 +1558,14 @@
      switch (pos)
      {
         case 0:
  -         if ((active0 & 0xa0000L) != 0L)
  +         if ((active0 & 0x50000L) != 0L)
            {
  -            jjmatchedKind = 20;
  +            jjmatchedKind = 19;
               return 3;
            }
  -         if ((active0 & 0x10000L) != 0L)
  +         if ((active0 & 0x8000L) != 0L)
            {
  -            jjmatchedKind = 15;
  +            jjmatchedKind = 14;
               return -1;
            }
            return -1;
  @@ -1862,11 +1590,11 @@
      switch(curChar)
      {
         case 35:
  -         return jjMoveStringLiteralDfa1_7(0xa0000L);
  +         return jjMoveStringLiteralDfa1_7(0x50000L);
         case 36:
  -         return jjMoveStringLiteralDfa1_7(0x10000L);
  +         return jjMoveStringLiteralDfa1_7(0x8000L);
         case 42:
  -         return jjMoveStringLiteralDfa1_7(0x1000000L);
  +         return jjMoveStringLiteralDfa1_7(0x800000L);
         default :
            return jjMoveNfa_7(4, 0);
      }
  @@ -1881,18 +1609,18 @@
      switch(curChar)
      {
         case 33:
  -         if ((active0 & 0x10000L) != 0L)
  -            return jjStopAtPos(1, 16);
  +         if ((active0 & 0x8000L) != 0L)
  +            return jjStopAtPos(1, 15);
            break;
         case 35:
  -         if ((active0 & 0x20000L) != 0L)
  -            return jjStopAtPos(1, 17);
  -         else if ((active0 & 0x1000000L) != 0L)
  -            return jjStopAtPos(1, 24);
  +         if ((active0 & 0x10000L) != 0L)
  +            return jjStopAtPos(1, 16);
  +         else if ((active0 & 0x800000L) != 0L)
  +            return jjStopAtPos(1, 23);
            break;
         case 42:
  -         if ((active0 & 0x80000L) != 0L)
  -            return jjStartNfaWithStates_7(1, 19, 1);
  +         if ((active0 & 0x40000L) != 0L)
  +            return jjStartNfaWithStates_7(1, 18, 1);
            break;
         default :
            break;
  @@ -1921,36 +1649,36 @@
                  case 4:
                     if (curChar == 35)
                     {
  -                     if (kind > 20)
  -                        kind = 20;
  +                     if (kind > 19)
  +                        kind = 19;
                     }
                     else if (curChar == 36)
                     {
  -                     if (kind > 15)
  -                        kind = 15;
  +                     if (kind > 14)
  +                        kind = 14;
                     }
                     if (curChar == 35)
                        jjstateSet[jjnewStateCnt++] = 3;
                     break;
                  case 0:
  -                  if (curChar == 36 && kind > 15)
  -                     kind = 15;
  +                  if (curChar == 36 && kind > 14)
  +                     kind = 14;
                     break;
                  case 1:
                     if (curChar == 42)
                        jjstateSet[jjnewStateCnt++] = 2;
                     break;
                  case 2:
  -                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 18)
  -                     kind = 18;
  +                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 17)
  +                     kind = 17;
                     break;
                  case 3:
                     if (curChar == 42)
                        jjstateSet[jjnewStateCnt++] = 1;
                     break;
                  case 5:
  -                  if (curChar == 35 && kind > 20)
  -                     kind = 20;
  +                  if (curChar == 35 && kind > 19)
  +                     kind = 19;
                     break;
                  default : break;
               }
  @@ -1968,8 +1696,8 @@
                        jjAddStates(7, 8);
                     break;
                  case 2:
  -                  if (kind > 18)
  -                     kind = 18;
  +                  if (kind > 17)
  +                     kind = 17;
                     break;
                  default : break;
               }
  @@ -1984,8 +1712,8 @@
               switch(jjstateSet[--i])
               {
                  case 2:
  -                  if ((jjbitVec0[i2] & l2) != 0L && kind > 18)
  -                     kind = 18;
  +                  if ((jjbitVec0[i2] & l2) != 0L && kind > 17)
  +                     kind = 17;
                     break;
                  default : break;
               }
  @@ -2004,81 +1732,205 @@
         catch(java.io.IOException e) { return curPos; }
      }
   }
  -private final int jjStopStringLiteralDfa_8(int pos, long active0)
  +private final int jjStopStringLiteralDfa_2(int pos, long active0)
   {
      switch (pos)
      {
         case 0:
  -         if ((active0 & 0xa0000L) != 0L)
  +         if ((active0 & 0x50000L) != 0L)
            {
  -            jjmatchedKind = 20;
  +            jjmatchedKind = 19;
               return 3;
            }
  -         if ((active0 & 0x10000L) != 0L)
  +         if ((active0 & 0x8000L) != 0L)
  +         {
  +            jjmatchedKind = 14;
  +            return -1;
  +         }
  +         if ((active0 & 0x60000000L) != 0L)
  +         {
  +            jjmatchedKind = 59;
  +            return 11;
  +         }
  +         return -1;
  +      case 1:
  +         if ((active0 & 0x60000000L) != 0L)
  +         {
  +            jjmatchedKind = 59;
  +            jjmatchedPos = 1;
  +            return 11;
  +         }
  +         if ((active0 & 0x40000L) != 0L)
  +            return 1;
  +         if ((active0 & 0x8000L) != 0L)
            {
  -            jjmatchedKind = 15;
  +            if (jjmatchedPos == 0)
  +            {
  +               jjmatchedKind = 14;
  +               jjmatchedPos = 0;
  +            }
               return -1;
            }
            return -1;
  +      case 2:
  +         if ((active0 & 0x60000000L) != 0L)
  +         {
  +            jjmatchedKind = 59;
  +            jjmatchedPos = 2;
  +            return 11;
  +         }
  +         return -1;
  +      case 3:
  +         if ((active0 & 0x20000000L) != 0L)
  +            return 11;
  +         if ((active0 & 0x40000000L) != 0L)
  +         {
  +            jjmatchedKind = 59;
  +            jjmatchedPos = 3;
  +            return 11;
  +         }
  +         return -1;
         default :
            return -1;
      }
   }
  -private final int jjStartNfa_8(int pos, long active0)
  +private final int jjStartNfa_2(int pos, long active0)
   {
  -   return jjMoveNfa_8(jjStopStringLiteralDfa_8(pos, active0), pos + 1);
  +   return jjMoveNfa_2(jjStopStringLiteralDfa_2(pos, active0), pos + 1);
   }
  -private final int jjStartNfaWithStates_8(int pos, int kind, int state)
  +private final int jjStartNfaWithStates_2(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_8(state, pos + 1);
  +   return jjMoveNfa_2(state, pos + 1);
   }
  -private final int jjMoveStringLiteralDfa0_8()
  +private final int jjMoveStringLiteralDfa0_2()
   {
      switch(curChar)
      {
         case 35:
  -         return jjMoveStringLiteralDfa1_8(0xa0000L);
  +         return jjMoveStringLiteralDfa1_2(0x50000L);
         case 36:
  -         return jjMoveStringLiteralDfa1_8(0x10000L);
  +         return jjMoveStringLiteralDfa1_2(0x8000L);
  +      case 41:
  +         return jjStopAtPos(0, 6);
  +      case 44:
  +         return jjStopAtPos(0, 3);
  +      case 91:
  +         return jjStopAtPos(0, 1);
  +      case 93:
  +         return jjStopAtPos(0, 2);
  +      case 102:
  +         return jjMoveStringLiteralDfa1_2(0x40000000L);
  +      case 116:
  +         return jjMoveStringLiteralDfa1_2(0x20000000L);
  +      case 123:
  +         return jjStopAtPos(0, 61);
  +      case 125:
  +         return jjStopAtPos(0, 62);
         default :
  -         return jjMoveNfa_8(4, 0);
  +         return jjMoveNfa_2(4, 0);
      }
   }
  -private final int jjMoveStringLiteralDfa1_8(long active0)
  +private final int jjMoveStringLiteralDfa1_2(long active0)
   {
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_8(0, active0);
  +      jjStopStringLiteralDfa_2(0, active0);
         return 1;
      }
      switch(curChar)
      {
         case 33:
  -         if ((active0 & 0x10000L) != 0L)
  -            return jjStopAtPos(1, 16);
  +         if ((active0 & 0x8000L) != 0L)
  +            return jjStopAtPos(1, 15);
            break;
         case 35:
  -         if ((active0 & 0x20000L) != 0L)
  -            return jjStopAtPos(1, 17);
  +         if ((active0 & 0x10000L) != 0L)
  +            return jjStopAtPos(1, 16);
            break;
         case 42:
  -         if ((active0 & 0x80000L) != 0L)
  -            return jjStartNfaWithStates_8(1, 19, 1);
  +         if ((active0 & 0x40000L) != 0L)
  +            return jjStartNfaWithStates_2(1, 18, 1);
            break;
  +      case 97:
  +         return jjMoveStringLiteralDfa2_2(active0, 0x40000000L);
  +      case 114:
  +         return jjMoveStringLiteralDfa2_2(active0, 0x20000000L);
         default :
            break;
      }
  -   return jjStartNfa_8(0, active0);
  +   return jjStartNfa_2(0, active0);
   }
  -private final int jjMoveNfa_8(int startState, int curPos)
  +private final int jjMoveStringLiteralDfa2_2(long old0, long active0)
  +{
  +   if (((active0 &= old0)) == 0L)
  +      return jjStartNfa_2(0, old0); 
  +   try { curChar = input_stream.readChar(); }
  +   catch(java.io.IOException e) {
  +      jjStopStringLiteralDfa_2(1, active0);
  +      return 2;
  +   }
  +   switch(curChar)
  +   {
  +      case 108:
  +         return jjMoveStringLiteralDfa3_2(active0, 0x40000000L);
  +      case 117:
  +         return jjMoveStringLiteralDfa3_2(active0, 0x20000000L);
  +      default :
  +         break;
  +   }
  +   return jjStartNfa_2(1, active0);
  +}
  +private final int jjMoveStringLiteralDfa3_2(long old0, long active0)
  +{
  +   if (((active0 &= old0)) == 0L)
  +      return jjStartNfa_2(1, old0); 
  +   try { curChar = input_stream.readChar(); }
  +   catch(java.io.IOException e) {
  +      jjStopStringLiteralDfa_2(2, active0);
  +      return 3;
  +   }
  +   switch(curChar)
  +   {
  +      case 101:
  +         if ((active0 & 0x20000000L) != 0L)
  +            return jjStartNfaWithStates_2(3, 29, 11);
  +         break;
  +      case 115:
  +         return jjMoveStringLiteralDfa4_2(active0, 0x40000000L);
  +      default :
  +         break;
  +   }
  +   return jjStartNfa_2(2, active0);
  +}
  +private final int jjMoveStringLiteralDfa4_2(long old0, long active0)
  +{
  +   if (((active0 &= old0)) == 0L)
  +      return jjStartNfa_2(2, old0); 
  +   try { curChar = input_stream.readChar(); }
  +   catch(java.io.IOException e) {
  +      jjStopStringLiteralDfa_2(3, active0);
  +      return 4;
  +   }
  +   switch(curChar)
  +   {
  +      case 101:
  +         if ((active0 & 0x40000000L) != 0L)
  +            return jjStartNfaWithStates_2(4, 30, 11);
  +         break;
  +      default :
  +         break;
  +   }
  +   return jjStartNfa_2(3, active0);
  +}
  +private final int jjMoveNfa_2(int startState, int curPos)
   {
      int[] nextStates;
      int startsAt = 0;
  -   jjnewStateCnt = 10;
  +   jjnewStateCnt = 15;
      int i = 1;
      jjstateSet[0] = startState;
      int j, kind = 0x7fffffff;
  @@ -2094,57 +1946,78 @@
               switch(jjstateSet[--i])
               {
                  case 4:
  -                  if ((0x2400L & l) != 0L)
  +                  if ((0x3ff000000000000L & l) != 0L)
                     {
  -                     if (kind > 23)
  -                        kind = 23;
  +                     if (kind > 53)
  +                        kind = 53;
  +                     jjCheckNAdd(9);
                     }
  +                  else if (curChar == 46)
  +                     jjstateSet[jjnewStateCnt++] = 13;
  +                  else if (curChar == 34)
  +                     jjCheckNAddTwoStates(7, 8);
                     else if (curChar == 35)
                     {
  -                     if (kind > 20)
  -                        kind = 20;
  +                     if (kind > 19)
  +                        kind = 19;
                     }
                     else if (curChar == 36)
                     {
  -                     if (kind > 15)
  -                        kind = 15;
  +                     if (kind > 14)
  +                        kind = 14;
                     }
  -                  if (curChar == 13)
  -                     jjstateSet[jjnewStateCnt++] = 7;
  -                  else if (curChar == 35)
  +                  if (curChar == 35)
                        jjstateSet[jjnewStateCnt++] = 3;
                     break;
                  case 0:
  -                  if (curChar == 36 && kind > 15)
  -                     kind = 15;
  +                  if (curChar == 36 && kind > 14)
  +                     kind = 14;
                     break;
                  case 1:
                     if (curChar == 42)
                        jjstateSet[jjnewStateCnt++] = 2;
                     break;
                  case 2:
  -                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 18)
  -                     kind = 18;
  +                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 17)
  +                     kind = 17;
                     break;
                  case 3:
                     if (curChar == 42)
                        jjstateSet[jjnewStateCnt++] = 1;
                     break;
                  case 5:
  -                  if (curChar == 35 && kind > 20)
  -                     kind = 20;
  +                  if (curChar == 35 && kind > 19)
  +                     kind = 19;
                     break;
                  case 6:
  -                  if ((0x2400L & l) != 0L && kind > 23)
  -                     kind = 23;
  +                  if (curChar == 34)
  +                     jjCheckNAddTwoStates(7, 8);
                     break;
                  case 7:
  -                  if (curChar == 10 && kind > 23)
  -                     kind = 23;
  +                  if ((0xfffffffbffffdbffL & l) != 0L)
  +                     jjCheckNAddTwoStates(7, 8);
                     break;
                  case 8:
  -                  if (curChar == 13)
  -                     jjstateSet[jjnewStateCnt++] = 7;
  +                  if (curChar == 34 && kind > 28)
  +                     kind = 28;
  +                  break;
  +               case 9:
  +                  if ((0x3ff000000000000L & l) == 0L)
  +                     break;
  +                  if (kind > 53)
  +                     kind = 53;
  +                  jjCheckNAdd(9);
  +                  break;
  +               case 11:
  +                  if ((0x3ff200000000000L & l) == 0L)
  +                     break;
  +                  if (kind > 59)
  +                     kind = 59;
  +                  jjstateSet[jjnewStateCnt++] = 11;
  +                  break;
  +               case 12:
  +                  if (curChar == 46)
  +                     jjstateSet[jjnewStateCnt++] = 13;
                     break;
                  default : break;
               }
  @@ -2158,13 +2031,44 @@
               switch(jjstateSet[--i])
               {
                  case 4:
  +                  if ((0x7fffffe07fffffeL & l) != 0L)
  +                  {
  +                     if (kind > 59)
  +                        kind = 59;
  +                     jjCheckNAdd(11);
  +                  }
  +                  else if (curChar == 92)
  +                     jjAddStates(7, 8);
  +                  break;
  +               case 2:
  +                  if (kind > 17)
  +                     kind = 17;
  +                  break;
  +               case 7:
  +                  jjAddStates(9, 10);
  +                  break;
  +               case 10:
  +                  if ((0x7fffffe07fffffeL & l) == 0L)
  +                     break;
  +                  if (kind > 59)
  +                     kind = 59;
  +                  jjCheckNAdd(11);
  +                  break;
  +               case 11:
  +                  if ((0x7fffffe87fffffeL & l) == 0L)
  +                     break;
  +                  if (kind > 59)
  +                     kind = 59;
  +                  jjCheckNAdd(11);
  +                  break;
  +               case 13:
  +                  if ((0x7fffffe07fffffeL & l) != 0L && kind > 60)
  +                     kind = 60;
  +                  break;
  +               case 14:
                     if (curChar == 92)
                        jjAddStates(7, 8);
                     break;
  -               case 2:
  -                  if (kind > 18)
  -                     kind = 18;
  -                  break;
                  default : break;
               }
            } while(i != startsAt);
  @@ -2178,8 +2082,12 @@
               switch(jjstateSet[--i])
               {
                  case 2:
  -                  if ((jjbitVec0[i2] & l2) != 0L && kind > 18)
  -                     kind = 18;
  +                  if ((jjbitVec0[i2] & l2) != 0L && kind > 17)
  +                     kind = 17;
  +                  break;
  +               case 7:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(9, 10);
                     break;
                  default : break;
               }
  @@ -2192,203 +2100,87 @@
            kind = 0x7fffffff;
         }
         ++curPos;
  -      if ((i = jjnewStateCnt) == (startsAt = 10 - (jjnewStateCnt = startsAt)))
  +      if ((i = jjnewStateCnt) == (startsAt = 15 - (jjnewStateCnt = startsAt)))
            return curPos;
         try { curChar = input_stream.readChar(); }
         catch(java.io.IOException e) { return curPos; }
      }
   }
  -private final int jjStopStringLiteralDfa_5(int pos, long active0, long active1)
  +private final int jjStopStringLiteralDfa_8(int pos, long active0)
   {
      switch (pos)
      {
         case 0:
  -         if ((active0 & 0xc0000000L) != 0L)
  -         {
  -            jjmatchedKind = 61;
  -            return 10;
  -         }
  -         if ((active0 & 0xa0000L) != 0L)
  +         if ((active0 & 0x50000L) != 0L)
            {
  -            jjmatchedKind = 20;
  +            jjmatchedKind = 19;
               return 3;
  -         }
  -         if ((active0 & 0x10000L) != 0L)
  -         {
  -            jjmatchedKind = 15;
  -            return -1;
            }
  -         return -1;
  -      case 1:
  -         if ((active0 & 0x10000L) != 0L)
  +         if ((active0 & 0x8000L) != 0L)
            {
  -            if (jjmatchedPos == 0)
  -            {
  -               jjmatchedKind = 15;
  -               jjmatchedPos = 0;
  -            }
  +            jjmatchedKind = 14;
               return -1;
            }
  -         if ((active0 & 0x80000L) != 0L)
  -            return 1;
  -         if ((active0 & 0xc0000000L) != 0L)
  -         {
  -            jjmatchedKind = 61;
  -            jjmatchedPos = 1;
  -            return 10;
  -         }
  -         return -1;
  -      case 2:
  -         if ((active0 & 0xc0000000L) != 0L)
  -         {
  -            jjmatchedKind = 61;
  -            jjmatchedPos = 2;
  -            return 10;
  -         }
  -         return -1;
  -      case 3:
  -         if ((active0 & 0x40000000L) != 0L)
  -            return 10;
  -         if ((active0 & 0x80000000L) != 0L)
  -         {
  -            jjmatchedKind = 61;
  -            jjmatchedPos = 3;
  -            return 10;
  -         }
            return -1;
         default :
            return -1;
      }
   }
  -private final int jjStartNfa_5(int pos, long active0, long active1)
  +private final int jjStartNfa_8(int pos, long active0)
   {
  -   return jjMoveNfa_5(jjStopStringLiteralDfa_5(pos, active0, active1), pos + 1);
  +   return jjMoveNfa_8(jjStopStringLiteralDfa_8(pos, active0), pos + 1);
   }
  -private final int jjStartNfaWithStates_5(int pos, int kind, int state)
  +private final int jjStartNfaWithStates_8(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_5(state, pos + 1);
  +   return jjMoveNfa_8(state, pos + 1);
   }
  -private final int jjMoveStringLiteralDfa0_5()
  +private final int jjMoveStringLiteralDfa0_8()
   {
      switch(curChar)
      {
         case 35:
  -         return jjMoveStringLiteralDfa1_5(0xa0000L);
  +         return jjMoveStringLiteralDfa1_8(0x50000L);
         case 36:
  -         return jjMoveStringLiteralDfa1_5(0x10000L);
  -      case 102:
  -         return jjMoveStringLiteralDfa1_5(0x80000000L);
  -      case 116:
  -         return jjMoveStringLiteralDfa1_5(0x40000000L);
  -      case 123:
  -         return jjStopAtPos(0, 63);
  -      case 125:
  -         return jjStopAtPos(0, 64);
  +         return jjMoveStringLiteralDfa1_8(0x8000L);
         default :
  -         return jjMoveNfa_5(4, 0);
  +         return jjMoveNfa_8(4, 0);
      }
   }
  -private final int jjMoveStringLiteralDfa1_5(long active0)
  +private final int jjMoveStringLiteralDfa1_8(long active0)
   {
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_5(0, active0, 0L);
  +      jjStopStringLiteralDfa_8(0, active0);
         return 1;
      }
      switch(curChar)
      {
         case 33:
  -         if ((active0 & 0x10000L) != 0L)
  -            return jjStopAtPos(1, 16);
  +         if ((active0 & 0x8000L) != 0L)
  +            return jjStopAtPos(1, 15);
            break;
         case 35:
  -         if ((active0 & 0x20000L) != 0L)
  -            return jjStopAtPos(1, 17);
  +         if ((active0 & 0x10000L) != 0L)
  +            return jjStopAtPos(1, 16);
            break;
         case 42:
  -         if ((active0 & 0x80000L) != 0L)
  -            return jjStartNfaWithStates_5(1, 19, 1);
  -         break;
  -      case 97:
  -         return jjMoveStringLiteralDfa2_5(active0, 0x80000000L);
  -      case 114:
  -         return jjMoveStringLiteralDfa2_5(active0, 0x40000000L);
  -      default :
  -         break;
  -   }
  -   return jjStartNfa_5(0, active0, 0L);
  -}
  -private final int jjMoveStringLiteralDfa2_5(long old0, long active0)
  -{
  -   if (((active0 &= old0)) == 0L)
  -      return jjStartNfa_5(0, old0, 0L);
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_5(1, active0, 0L);
  -      return 2;
  -   }
  -   switch(curChar)
  -   {
  -      case 108:
  -         return jjMoveStringLiteralDfa3_5(active0, 0x80000000L);
  -      case 117:
  -         return jjMoveStringLiteralDfa3_5(active0, 0x40000000L);
  -      default :
  -         break;
  -   }
  -   return jjStartNfa_5(1, active0, 0L);
  -}
  -private final int jjMoveStringLiteralDfa3_5(long old0, long active0)
  -{
  -   if (((active0 &= old0)) == 0L)
  -      return jjStartNfa_5(1, old0, 0L);
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_5(2, active0, 0L);
  -      return 3;
  -   }
  -   switch(curChar)
  -   {
  -      case 101:
  -         if ((active0 & 0x40000000L) != 0L)
  -            return jjStartNfaWithStates_5(3, 30, 10);
  -         break;
  -      case 115:
  -         return jjMoveStringLiteralDfa4_5(active0, 0x80000000L);
  -      default :
  -         break;
  -   }
  -   return jjStartNfa_5(2, active0, 0L);
  -}
  -private final int jjMoveStringLiteralDfa4_5(long old0, long active0)
  -{
  -   if (((active0 &= old0)) == 0L)
  -      return jjStartNfa_5(2, old0, 0L);
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_5(3, active0, 0L);
  -      return 4;
  -   }
  -   switch(curChar)
  -   {
  -      case 101:
  -         if ((active0 & 0x80000000L) != 0L)
  -            return jjStartNfaWithStates_5(4, 31, 10);
  +         if ((active0 & 0x40000L) != 0L)
  +            return jjStartNfaWithStates_8(1, 18, 1);
            break;
         default :
            break;
      }
  -   return jjStartNfa_5(3, active0, 0L);
  +   return jjStartNfa_8(0, active0);
   }
  -private final int jjMoveNfa_5(int startState, int curPos)
  +private final int jjMoveNfa_8(int startState, int curPos)
   {
      int[] nextStates;
      int startsAt = 0;
  -   jjnewStateCnt = 14;
  +   jjnewStateCnt = 10;
      int i = 1;
      jjstateSet[0] = startState;
      int j, kind = 0x7fffffff;
  @@ -2404,65 +2196,57 @@
               switch(jjstateSet[--i])
               {
                  case 4:
  -                  if (curChar == 46)
  -                     jjstateSet[jjnewStateCnt++] = 12;
  -                  else if (curChar == 34)
  -                     jjCheckNAddTwoStates(7, 8);
  +                  if ((0x2400L & l) != 0L)
  +                  {
  +                     if (kind > 22)
  +                        kind = 22;
  +                  }
                     else if (curChar == 35)
                     {
  -                     if (kind > 20)
  -                        kind = 20;
  +                     if (kind > 19)
  +                        kind = 19;
                     }
                     else if (curChar == 36)
                     {
  -                     if (kind > 15)
  -                        kind = 15;
  +                     if (kind > 14)
  +                        kind = 14;
                     }
  -                  if (curChar == 35)
  +                  if (curChar == 13)
  +                     jjstateSet[jjnewStateCnt++] = 7;
  +                  else if (curChar == 35)
                        jjstateSet[jjnewStateCnt++] = 3;
                     break;
                  case 0:
  -                  if (curChar == 36 && kind > 15)
  -                     kind = 15;
  +                  if (curChar == 36 && kind > 14)
  +                     kind = 14;
                     break;
                  case 1:
                     if (curChar == 42)
                        jjstateSet[jjnewStateCnt++] = 2;
                     break;
                  case 2:
  -                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 18)
  -                     kind = 18;
  +                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 17)
  +                     kind = 17;
                     break;
                  case 3:
                     if (curChar == 42)
                        jjstateSet[jjnewStateCnt++] = 1;
                     break;
                  case 5:
  -                  if (curChar == 35 && kind > 20)
  -                     kind = 20;
  +                  if (curChar == 35 && kind > 19)
  +                     kind = 19;
                     break;
                  case 6:
  -                  if (curChar == 34)
  -                     jjCheckNAddTwoStates(7, 8);
  +                  if ((0x2400L & l) != 0L && kind > 22)
  +                     kind = 22;
                     break;
                  case 7:
  -                  if ((0xfffffffbffffdbffL & l) != 0L)
  -                     jjCheckNAddTwoStates(7, 8);
  +                  if (curChar == 10 && kind > 22)
  +                     kind = 22;
                     break;
                  case 8:
  -                  if (curChar == 34 && kind > 29)
  -                     kind = 29;
  -                  break;
  -               case 10:
  -                  if ((0x3ff200000000000L & l) == 0L)
  -                     break;
  -                  if (kind > 61)
  -                     kind = 61;
  -                  jjstateSet[jjnewStateCnt++] = 10;
  -                  break;
  -               case 11:
  -                  if (curChar == 46)
  -                     jjstateSet[jjnewStateCnt++] = 12;
  +                  if (curChar == 13)
  +                     jjstateSet[jjnewStateCnt++] = 7;
                     break;
                  default : break;
               }
  @@ -2476,43 +2260,12 @@
               switch(jjstateSet[--i])
               {
                  case 4:
  -                  if ((0x7fffffe07fffffeL & l) != 0L)
  -                  {
  -                     if (kind > 61)
  -                        kind = 61;
  -                     jjCheckNAdd(10);
  -                  }
  -                  else if (curChar == 92)
  +                  if (curChar == 92)
                        jjAddStates(7, 8);
                     break;
                  case 2:
  -                  if (kind > 18)
  -                     kind = 18;
  -                  break;
  -               case 7:
  -                  jjAddStates(14, 15);
  -                  break;
  -               case 9:
  -                  if ((0x7fffffe07fffffeL & l) == 0L)
  -                     break;
  -                  if (kind > 61)
  -                     kind = 61;
  -                  jjCheckNAdd(10);
  -                  break;
  -               case 10:
  -                  if ((0x7fffffe87fffffeL & l) == 0L)
  -                     break;
  -                  if (kind > 61)
  -                     kind = 61;
  -                  jjCheckNAdd(10);
  -                  break;
  -               case 12:
  -                  if ((0x7fffffe07fffffeL & l) != 0L && kind > 62)
  -                     kind = 62;
  -                  break;
  -               case 13:
  -                  if (curChar == 92)
  -                     jjAddStates(7, 8);
  +                  if (kind > 17)
  +                     kind = 17;
                     break;
                  default : break;
               }
  @@ -2527,12 +2280,8 @@
               switch(jjstateSet[--i])
               {
                  case 2:
  -                  if ((jjbitVec0[i2] & l2) != 0L && kind > 18)
  -                     kind = 18;
  -                  break;
  -               case 7:
  -                  if ((jjbitVec0[i2] & l2) != 0L)
  -                     jjAddStates(14, 15);
  +                  if ((jjbitVec0[i2] & l2) != 0L && kind > 17)
  +                     kind = 17;
                     break;
                  default : break;
               }
  @@ -2545,211 +2294,237 @@
            kind = 0x7fffffff;
         }
         ++curPos;
  -      if ((i = jjnewStateCnt) == (startsAt = 14 - (jjnewStateCnt = startsAt)))
  +      if ((i = jjnewStateCnt) == (startsAt = 10 - (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_4(int pos, long active0)
   {
      switch (pos)
      {
         case 0:
  -         if ((active0 & 0xa0000L) != 0L)
  +         if ((active0 & 0x6000000000000L) != 0L)
            {
  -            jjmatchedKind = 20;
  -            return 3;
  +            jjmatchedKind = 55;
  +            return 11;
            }
  -         if ((active0 & 0x10000L) != 0L)
  +         if ((active0 & 0x9000000000000L) != 0L)
            {
  -            jjmatchedKind = 15;
  -            return -1;
  +            jjmatchedKind = 55;
  +            return 14;
            }
  -         if ((active0 & 0xc0000000L) != 0L)
  +         if ((active0 & 0x50000L) != 0L)
            {
  -            jjmatchedKind = 61;
  -            return 11;
  +            jjmatchedKind = 19;
  +            return 3;
  +         }
  +         if ((active0 & 0x8000L) != 0L)
  +         {
  +            jjmatchedKind = 14;
  +            return -1;
            }
            return -1;
         case 1:
  -         if ((active0 & 0xc0000000L) != 0L)
  +         if ((active0 & 0x1000000000000L) != 0L)
  +            return 14;
  +         if ((active0 & 0x40000L) != 0L)
  +            return 1;
  +         if ((active0 & 0xe000000000000L) != 0L)
            {
  -            jjmatchedKind = 61;
  +            jjmatchedKind = 55;
               jjmatchedPos = 1;
  -            return 11;
  +            return 14;
            }
  -         if ((active0 & 0x10000L) != 0L)
  +         if ((active0 & 0x8000L) != 0L)
            {
               if (jjmatchedPos == 0)
               {
  -               jjmatchedKind = 15;
  +               jjmatchedKind = 14;
                  jjmatchedPos = 0;
               }
               return -1;
            }
  -         if ((active0 & 0x80000L) != 0L)
  -            return 1;
            return -1;
         case 2:
  -         if ((active0 & 0xc0000000L) != 0L)
  +         if ((active0 & 0xe000000000000L) != 0L)
            {
  -            jjmatchedKind = 61;
  +            jjmatchedKind = 55;
               jjmatchedPos = 2;
  -            return 11;
  +            return 14;
            }
            return -1;
         case 3:
  -         if ((active0 & 0x40000000L) != 0L)
  -            return 11;
  -         if ((active0 & 0x80000000L) != 0L)
  +         if ((active0 & 0xe000000000000L) != 0L)
  +            return 14;
  +         return -1;
  +      case 4:
  +         if ((active0 & 0x2000000000000L) != 0L)
            {
  -            jjmatchedKind = 61;
  -            jjmatchedPos = 3;
  -            return 11;
  +            jjmatchedKind = 55;
  +            jjmatchedPos = 4;
  +            return 14;
            }
            return -1;
         default :
            return -1;
      }
   }
  -private final int jjStartNfa_2(int pos, long active0, long active1)
  +private final int jjStartNfa_4(int pos, long active0)
   {
  -   return jjMoveNfa_2(jjStopStringLiteralDfa_2(pos, active0, active1), pos + 1);
  +   return jjMoveNfa_4(jjStopStringLiteralDfa_4(pos, active0), pos + 1);
   }
  -private final int jjStartNfaWithStates_2(int pos, int kind, int state)
  +private final int jjStartNfaWithStates_4(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_4(state, pos + 1);
   }
  -private final int jjMoveStringLiteralDfa0_2()
  +private final int jjMoveStringLiteralDfa0_4()
   {
      switch(curChar)
      {
         case 35:
  -         return jjMoveStringLiteralDfa1_2(0xa0000L);
  +         return jjMoveStringLiteralDfa1_4(0x50000L);
         case 36:
  -         return jjMoveStringLiteralDfa1_2(0x10000L);
  -      case 41:
  -         return jjStopAtPos(0, 6);
  -      case 44:
  -         return jjStopAtPos(0, 3);
  -      case 91:
  -         return jjStopAtPos(0, 1);
  -      case 93:
  -         return jjStopAtPos(0, 2);
  -      case 102:
  -         return jjMoveStringLiteralDfa1_2(0x80000000L);
  -      case 116:
  -         return jjMoveStringLiteralDfa1_2(0x40000000L);
  -      case 123:
  -         return jjStopAtPos(0, 63);
  -      case 125:
  -         return jjStopAtPos(0, 64);
  +         return jjMoveStringLiteralDfa1_4(0x8000L);
  +      case 101:
  +         return jjMoveStringLiteralDfa1_4(0x6000000000000L);
  +      case 105:
  +         return jjMoveStringLiteralDfa1_4(0x1000000000000L);
  +      case 115:
  +         return jjMoveStringLiteralDfa1_4(0x8000000000000L);
         default :
  -         return jjMoveNfa_2(4, 0);
  +         return jjMoveNfa_4(4, 0);
      }
   }
  -private final int jjMoveStringLiteralDfa1_2(long active0)
  +private final int jjMoveStringLiteralDfa1_4(long active0)
   {
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_2(0, active0, 0L);
  +      jjStopStringLiteralDfa_4(0, active0);
         return 1;
      }
      switch(curChar)
      {
         case 33:
  -         if ((active0 & 0x10000L) != 0L)
  -            return jjStopAtPos(1, 16);
  +         if ((active0 & 0x8000L) != 0L)
  +            return jjStopAtPos(1, 15);
            break;
         case 35:
  -         if ((active0 & 0x20000L) != 0L)
  -            return jjStopAtPos(1, 17);
  +         if ((active0 & 0x10000L) != 0L)
  +            return jjStopAtPos(1, 16);
            break;
         case 42:
  -         if ((active0 & 0x80000L) != 0L)
  -            return jjStartNfaWithStates_2(1, 19, 1);
  +         if ((active0 & 0x40000L) != 0L)
  +            return jjStartNfaWithStates_4(1, 18, 1);
            break;
  -      case 97:
  -         return jjMoveStringLiteralDfa2_2(active0, 0x80000000L);
  -      case 114:
  -         return jjMoveStringLiteralDfa2_2(active0, 0x40000000L);
  +      case 102:
  +         if ((active0 & 0x1000000000000L) != 0L)
  +            return jjStartNfaWithStates_4(1, 48, 14);
  +         break;
  +      case 108:
  +         return jjMoveStringLiteralDfa2_4(active0, 0x6000000000000L);
  +      case 116:
  +         return jjMoveStringLiteralDfa2_4(active0, 0x8000000000000L);
         default :
            break;
      }
  -   return jjStartNfa_2(0, active0, 0L);
  +   return jjStartNfa_4(0, active0);
   }
  -private final int jjMoveStringLiteralDfa2_2(long old0, long active0)
  +private final int jjMoveStringLiteralDfa2_4(long old0, long active0)
   {
      if (((active0 &= old0)) == 0L)
  -      return jjStartNfa_2(0, old0, 0L);
  +      return jjStartNfa_4(0, old0); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_2(1, active0, 0L);
  +      jjStopStringLiteralDfa_4(1, active0);
         return 2;
      }
      switch(curChar)
      {
  -      case 108:
  -         return jjMoveStringLiteralDfa3_2(active0, 0x80000000L);
  -      case 117:
  -         return jjMoveStringLiteralDfa3_2(active0, 0x40000000L);
  +      case 111:
  +         return jjMoveStringLiteralDfa3_4(active0, 0x8000000000000L);
  +      case 115:
  +         return jjMoveStringLiteralDfa3_4(active0, 0x6000000000000L);
         default :
            break;
      }
  -   return jjStartNfa_2(1, active0, 0L);
  +   return jjStartNfa_4(1, active0);
   }
  -private final int jjMoveStringLiteralDfa3_2(long old0, long active0)
  +private final int jjMoveStringLiteralDfa3_4(long old0, long active0)
   {
      if (((active0 &= old0)) == 0L)
  -      return jjStartNfa_2(1, old0, 0L);
  +      return jjStartNfa_4(1, old0); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_2(2, active0, 0L);
  +      jjStopStringLiteralDfa_4(2, active0);
         return 3;
      }
      switch(curChar)
      {
         case 101:
  -         if ((active0 & 0x40000000L) != 0L)
  -            return jjStartNfaWithStates_2(3, 30, 11);
  +         if ((active0 & 0x4000000000000L) != 0L)
  +         {
  +            jjmatchedKind = 50;
  +            jjmatchedPos = 3;
  +         }
  +         return jjMoveStringLiteralDfa4_4(active0, 0x2000000000000L);
  +      case 112:
  +         if ((active0 & 0x8000000000000L) != 0L)
  +            return jjStartNfaWithStates_4(3, 51, 14);
            break;
  -      case 115:
  -         return jjMoveStringLiteralDfa4_2(active0, 0x80000000L);
         default :
            break;
      }
  -   return jjStartNfa_2(2, active0, 0L);
  +   return jjStartNfa_4(2, active0);
   }
  -private final int jjMoveStringLiteralDfa4_2(long old0, long active0)
  +private final int jjMoveStringLiteralDfa4_4(long old0, long active0)
   {
      if (((active0 &= old0)) == 0L)
  -      return jjStartNfa_2(2, old0, 0L);
  +      return jjStartNfa_4(2, old0); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_2(3, active0, 0L);
  +      jjStopStringLiteralDfa_4(3, active0);
         return 4;
      }
      switch(curChar)
      {
  -      case 101:
  -         if ((active0 & 0x80000000L) != 0L)
  -            return jjStartNfaWithStates_2(4, 31, 11);
  +      case 105:
  +         return jjMoveStringLiteralDfa5_4(active0, 0x2000000000000L);
  +      default :
  +         break;
  +   }
  +   return jjStartNfa_4(3, active0);
  +}
  +private final int jjMoveStringLiteralDfa5_4(long old0, long active0)
  +{
  +   if (((active0 &= old0)) == 0L)
  +      return jjStartNfa_4(3, old0); 
  +   try { curChar = input_stream.readChar(); }
  +   catch(java.io.IOException e) {
  +      jjStopStringLiteralDfa_4(4, active0);
  +      return 5;
  +   }
  +   switch(curChar)
  +   {
  +      case 102:
  +         if ((active0 & 0x2000000000000L) != 0L)
  +            return jjStartNfaWithStates_4(5, 49, 14);
            break;
         default :
            break;
      }
  -   return jjStartNfa_2(3, active0, 0L);
  +   return jjStartNfa_4(4, active0);
   }
  -private final int jjMoveNfa_2(int startState, int curPos)
  +private final int jjMoveNfa_4(int startState, int curPos)
   {
      int[] nextStates;
      int startsAt = 0;
  -   jjnewStateCnt = 15;
  +   jjnewStateCnt = 16;
      int i = 1;
      jjstateSet[0] = startState;
      int j, kind = 0x7fffffff;
  @@ -2767,76 +2542,65 @@
                  case 4:
                     if ((0x3ff000000000000L & l) != 0L)
                     {
  -                     if (kind > 55)
  -                        kind = 55;
  -                     jjCheckNAdd(9);
  +                     if (kind > 53)
  +                        kind = 53;
  +                     jjCheckNAdd(13);
                     }
  -                  else if (curChar == 46)
  -                     jjstateSet[jjnewStateCnt++] = 13;
  -                  else if (curChar == 34)
  -                     jjCheckNAddTwoStates(7, 8);
                     else if (curChar == 35)
                     {
  -                     if (kind > 20)
  -                        kind = 20;
  +                     if (kind > 19)
  +                        kind = 19;
                     }
                     else if (curChar == 36)
                     {
  -                     if (kind > 15)
  -                        kind = 15;
  +                     if (kind > 14)
  +                        kind = 14;
                     }
                     if (curChar == 35)
                        jjstateSet[jjnewStateCnt++] = 3;
                     break;
                  case 0:
  -                  if (curChar == 36 && kind > 15)
  -                     kind = 15;
  +                  if (curChar == 36 && kind > 14)
  +                     kind = 14;
                     break;
                  case 1:
                     if (curChar == 42)
                        jjstateSet[jjnewStateCnt++] = 2;
                     break;
                  case 2:
  -                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 18)
  -                     kind = 18;
  +                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 17)
  +                     kind = 17;
                     break;
                  case 3:
                     if (curChar == 42)
                        jjstateSet[jjnewStateCnt++] = 1;
                     break;
                  case 5:
  -                  if (curChar == 35 && kind > 20)
  -                     kind = 20;
  -                  break;
  -               case 6:
  -                  if (curChar == 34)
  -                     jjCheckNAddTwoStates(7, 8);
  +                  if (curChar == 35 && kind > 19)
  +                     kind = 19;
                     break;
                  case 7:
  -                  if ((0xfffffffbffffdbffL & l) != 0L)
  -                     jjCheckNAddTwoStates(7, 8);
  +                  if ((0x100000200L & l) != 0L)
  +                     jjAddStates(11, 13);
                     break;
                  case 8:
  -                  if (curChar == 34 && kind > 29)
  -                     kind = 29;
  +                  if ((0x2400L & l) != 0L && kind > 47)
  +                     kind = 47;
                     break;
                  case 9:
  -                  if ((0x3ff000000000000L & l) == 0L)
  -                     break;
  -                  if (kind > 55)
  -                     kind = 55;
  -                  jjCheckNAdd(9);
  +                  if (curChar == 10 && kind > 47)
  +                     kind = 47;
                     break;
  -               case 11:
  -                  if ((0x3ff200000000000L & l) == 0L)
  -                     break;
  -                  if (kind > 61)
  -                     kind = 61;
  -                  jjstateSet[jjnewStateCnt++] = 11;
  +               case 10:
  +                  if (curChar == 13)
  +                     jjstateSet[jjnewStateCnt++] = 9;
                     break;
  -               case 12:
  -                  if (curChar == 46)
  -                     jjstateSet[jjnewStateCnt++] = 13;
  +               case 13:
  +                  if ((0x3ff000000000000L & l) == 0L)
  +                     break;
  +                  if (kind > 53)
  +                     kind = 53;
  +                  jjCheckNAdd(13);
                     break;
                  default : break;
               }
  @@ -2849,42 +2613,51 @@
            {
               switch(jjstateSet[--i])
               {
  +               case 11:
  +                  if ((0x7fffffe07fffffeL & l) != 0L)
  +                  {
  +                     if (kind > 55)
  +                        kind = 55;
  +                     jjCheckNAdd(14);
  +                  }
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 6;
  +                  break;
                  case 4:
                     if ((0x7fffffe07fffffeL & l) != 0L)
                     {
  -                     if (kind > 61)
  -                        kind = 61;
  -                     jjCheckNAdd(11);
  +                     if (kind > 55)
  +                        kind = 55;
  +                     jjCheckNAdd(14);
                     }
                     else if (curChar == 92)
                        jjAddStates(7, 8);
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 11;
                     break;
                  case 2:
  -                  if (kind > 18)
  -                     kind = 18;
  -                  break;
  -               case 7:
  -                  jjAddStates(14, 15);
  -                  break;
  -               case 10:
  -                  if ((0x7fffffe07fffffeL & l) == 0L)
  -                     break;
  -                  if (kind > 61)
  -                     kind = 61;
  -                  jjCheckNAdd(11);
  +                  if (kind > 17)
  +                     kind = 17;
                     break;
  -               case 11:
  -                  if ((0x7fffffe87fffffeL & l) == 0L)
  +               case 6:
  +                  if (curChar != 100)
                        break;
  -                  if (kind > 61)
  -                     kind = 61;
  -                  jjCheckNAdd(11);
  +                  if (kind > 47)
  +                     kind = 47;
  +                  jjAddStates(11, 13);
                     break;
  -               case 13:
  -                  if ((0x7fffffe07fffffeL & l) != 0L && kind > 62)
  -                     kind = 62;
  +               case 12:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 11;
                     break;
                  case 14:
  +                  if ((0x7fffffe07fffffeL & l) == 0L)
  +                     break;
  +                  if (kind > 55)
  +                     kind = 55;
  +                  jjCheckNAdd(14);
  +                  break;
  +               case 15:
                     if (curChar == 92)
                        jjAddStates(7, 8);
                     break;
  @@ -2901,12 +2674,8 @@
               switch(jjstateSet[--i])
               {
                  case 2:
  -                  if ((jjbitVec0[i2] & l2) != 0L && kind > 18)
  -                     kind = 18;
  -                  break;
  -               case 7:
  -                  if ((jjbitVec0[i2] & l2) != 0L)
  -                     jjAddStates(14, 15);
  +                  if ((jjbitVec0[i2] & l2) != 0L && kind > 17)
  +                     kind = 17;
                     break;
                  default : break;
               }
  @@ -2919,209 +2688,309 @@
            kind = 0x7fffffff;
         }
         ++curPos;
  -      if ((i = jjnewStateCnt) == (startsAt = 15 - (jjnewStateCnt = startsAt)))
  +      if ((i = jjnewStateCnt) == (startsAt = 16 - (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)
  +private final int jjStopStringLiteralDfa_3(int pos, long active0)
   {
      switch (pos)
      {
         case 0:
  -         if ((active0 & 0xc0000000L) != 0L)
  -         {
  -            jjmatchedKind = 61;
  -            return 10;
  -         }
  -         if ((active0 & 0xa0000L) != 0L)
  +         if ((active0 & 0x50000L) != 0L)
            {
  -            jjmatchedKind = 20;
  -            return 3;
  +            jjmatchedKind = 19;
  +            return 11;
            }
  -         if ((active0 & 0x10000L) != 0L)
  +         if ((active0 & 0x101f80L) != 0L)
  +            return 13;
  +         if ((active0 & 0x8000L) != 0L)
            {
  -            jjmatchedKind = 15;
  +            jjmatchedKind = 14;
               return -1;
            }
            return -1;
         case 1:
  -         if ((active0 & 0x10000L) != 0L)
  +         if ((active0 & 0x40000L) != 0L)
  +            return 9;
  +         if ((active0 & 0x1f80L) != 0L)
  +         {
  +            jjmatchedKind = 19;
  +            jjmatchedPos = 1;
  +            return -1;
  +         }
  +         if ((active0 & 0x8000L) != 0L)
            {
               if (jjmatchedPos == 0)
               {
  -               jjmatchedKind = 15;
  +               jjmatchedKind = 14;
                  jjmatchedPos = 0;
               }
               return -1;
            }
  -         if ((active0 & 0x80000L) != 0L)
  -            return 1;
  -         if ((active0 & 0xc0000000L) != 0L)
  -         {
  -            jjmatchedKind = 61;
  -            jjmatchedPos = 1;
  -            return 10;
  -         }
            return -1;
         case 2:
  -         if ((active0 & 0xc0000000L) != 0L)
  +         if ((active0 & 0x1f80L) != 0L)
            {
  -            jjmatchedKind = 61;
  -            jjmatchedPos = 2;
  -            return 10;
  +            if (jjmatchedPos < 1)
  +            {
  +               jjmatchedKind = 19;
  +               jjmatchedPos = 1;
  +            }
  +            return -1;
            }
            return -1;
         case 3:
  -         if ((active0 & 0x40000000L) != 0L)
  -            return 10;
  -         if ((active0 & 0x80000000L) != 0L)
  +         if ((active0 & 0x1f80L) != 0L)
            {
  -            jjmatchedKind = 61;
  -            jjmatchedPos = 3;
  -            return 10;
  +            if (jjmatchedPos < 1)
  +            {
  +               jjmatchedKind = 19;
  +               jjmatchedPos = 1;
  +            }
  +            return -1;
  +         }
  +         return -1;
  +      case 4:
  +         if ((active0 & 0x1e80L) != 0L)
  +         {
  +            if (jjmatchedPos < 1)
  +            {
  +               jjmatchedKind = 19;
  +               jjmatchedPos = 1;
  +            }
  +            return -1;
  +         }
  +         return -1;
  +      case 5:
  +         if ((active0 & 0x1c00L) != 0L)
  +         {
  +            if (jjmatchedPos < 1)
  +            {
  +               jjmatchedKind = 19;
  +               jjmatchedPos = 1;
  +            }
  +            return -1;
  +         }
  +         return -1;
  +      case 6:
  +         if ((active0 & 0x400L) != 0L)
  +         {
  +            if (jjmatchedPos < 1)
  +            {
  +               jjmatchedKind = 19;
  +               jjmatchedPos = 1;
  +            }
  +            return -1;
            }
            return -1;
         default :
            return -1;
      }
   }
  -private final int jjStartNfa_1(int pos, long active0, long active1)
  +private final int jjStartNfa_3(int pos, long active0)
   {
  -   return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0, active1), pos + 1);
  +   return jjMoveNfa_3(jjStopStringLiteralDfa_3(pos, active0), pos + 1);
   }
  -private final int jjStartNfaWithStates_1(int pos, int kind, int state)
  +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_1(state, pos + 1);
  +   return jjMoveNfa_3(state, pos + 1);
  +}
  +private final int jjMoveStringLiteralDfa0_3()
  +{
  +   switch(curChar)
  +   {
  +      case 35:
  +         return jjMoveStringLiteralDfa1_3(0x50000L);
  +      case 36:
  +         return jjMoveStringLiteralDfa1_3(0x8000L);
  +      case 92:
  +         jjmatchedKind = 20;
  +         return jjMoveStringLiteralDfa1_3(0x1f80L);
  +      default :
  +         return jjMoveNfa_3(8, 0);
  +   }
  +}
  +private final int jjMoveStringLiteralDfa1_3(long active0)
  +{
  +   try { curChar = input_stream.readChar(); }
  +   catch(java.io.IOException e) {
  +      jjStopStringLiteralDfa_3(0, active0);
  +      return 1;
  +   }
  +   switch(curChar)
  +   {
  +      case 33:
  +         if ((active0 & 0x8000L) != 0L)
  +            return jjStopAtPos(1, 15);
  +         break;
  +      case 35:
  +         if ((active0 & 0x10000L) != 0L)
  +            return jjStopAtPos(1, 16);
  +         return jjMoveStringLiteralDfa2_3(active0, 0x1f80L);
  +      case 42:
  +         if ((active0 & 0x40000L) != 0L)
  +            return jjStartNfaWithStates_3(1, 18, 9);
  +         break;
  +      default :
  +         break;
  +   }
  +   return jjStartNfa_3(0, active0);
  +}
  +private final int jjMoveStringLiteralDfa2_3(long old0, long active0)
  +{
  +   if (((active0 &= old0)) == 0L)
  +      return jjStartNfa_3(0, old0); 
  +   try { curChar = input_stream.readChar(); }
  +   catch(java.io.IOException e) {
  +      jjStopStringLiteralDfa_3(1, active0);
  +      return 2;
  +   }
  +   switch(curChar)
  +   {
  +      case 101:
  +         return jjMoveStringLiteralDfa3_3(active0, 0xe00L);
  +      case 105:
  +         return jjMoveStringLiteralDfa3_3(active0, 0x100L);
  +      case 115:
  +         return jjMoveStringLiteralDfa3_3(active0, 0x1080L);
  +      default :
  +         break;
  +   }
  +   return jjStartNfa_3(1, active0);
   }
  -private final int jjMoveStringLiteralDfa0_1()
  +private final int jjMoveStringLiteralDfa3_3(long old0, long active0)
   {
  +   if (((active0 &= old0)) == 0L)
  +      return jjStartNfa_3(1, old0); 
  +   try { curChar = input_stream.readChar(); }
  +   catch(java.io.IOException e) {
  +      jjStopStringLiteralDfa_3(2, active0);
  +      return 3;
  +   }
      switch(curChar)
      {
  -      case 35:
  -         return jjMoveStringLiteralDfa1_1(0xa0000L);
  -      case 36:
  -         return jjMoveStringLiteralDfa1_1(0x10000L);
  -      case 40:
  -         return jjStopAtPos(0, 4);
  -      case 91:
  -         return jjStopAtPos(0, 1);
  -      case 93:
  -         return jjStopAtPos(0, 2);
  +      case 101:
  +         return jjMoveStringLiteralDfa4_3(active0, 0x80L);
         case 102:
  -         return jjMoveStringLiteralDfa1_1(0x80000000L);
  +         if ((active0 & 0x100L) != 0L)
  +            return jjStopAtPos(3, 8);
  +         break;
  +      case 108:
  +         return jjMoveStringLiteralDfa4_3(active0, 0xc00L);
  +      case 110:
  +         return jjMoveStringLiteralDfa4_3(active0, 0x200L);
         case 116:
  -         return jjMoveStringLiteralDfa1_1(0x40000000L);
  -      case 123:
  -         return jjStopAtPos(0, 63);
  -      case 125:
  -         return jjStopAtPos(0, 64);
  +         return jjMoveStringLiteralDfa4_3(active0, 0x1000L);
         default :
  -         return jjMoveNfa_1(4, 0);
  +         break;
      }
  +   return jjStartNfa_3(2, active0);
   }
  -private final int jjMoveStringLiteralDfa1_1(long active0)
  +private final int jjMoveStringLiteralDfa4_3(long old0, long active0)
   {
  +   if (((active0 &= old0)) == 0L)
  +      return jjStartNfa_3(2, old0); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_1(0, active0, 0L);
  -      return 1;
  +      jjStopStringLiteralDfa_3(3, active0);
  +      return 4;
      }
      switch(curChar)
      {
  -      case 33:
  -         if ((active0 & 0x10000L) != 0L)
  -            return jjStopAtPos(1, 16);
  -         break;
  -      case 35:
  -         if ((active0 & 0x20000L) != 0L)
  -            return jjStopAtPos(1, 17);
  +      case 100:
  +         if ((active0 & 0x200L) != 0L)
  +            return jjStopAtPos(4, 9);
            break;
  -      case 42:
  -         if ((active0 & 0x80000L) != 0L)
  -            return jjStartNfaWithStates_1(1, 19, 1);
  +      case 111:
  +         return jjMoveStringLiteralDfa5_3(active0, 0x1000L);
  +      case 115:
  +         return jjMoveStringLiteralDfa5_3(active0, 0xc00L);
  +      case 116:
  +         if ((active0 & 0x80L) != 0L)
  +            return jjStopAtPos(4, 7);
            break;
  -      case 97:
  -         return jjMoveStringLiteralDfa2_1(active0, 0x80000000L);
  -      case 114:
  -         return jjMoveStringLiteralDfa2_1(active0, 0x40000000L);
         default :
            break;
      }
  -   return jjStartNfa_1(0, active0, 0L);
  +   return jjStartNfa_3(3, active0);
   }
  -private final int jjMoveStringLiteralDfa2_1(long old0, long active0)
  +private final int jjMoveStringLiteralDfa5_3(long old0, long active0)
   {
      if (((active0 &= old0)) == 0L)
  -      return jjStartNfa_1(0, old0, 0L);
  +      return jjStartNfa_3(3, old0); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_1(1, active0, 0L);
  -      return 2;
  +      jjStopStringLiteralDfa_3(4, active0);
  +      return 5;
      }
      switch(curChar)
      {
  -      case 108:
  -         return jjMoveStringLiteralDfa3_1(active0, 0x80000000L);
  -      case 117:
  -         return jjMoveStringLiteralDfa3_1(active0, 0x40000000L);
  +      case 101:
  +         if ((active0 & 0x800L) != 0L)
  +         {
  +            jjmatchedKind = 11;
  +            jjmatchedPos = 5;
  +         }
  +         return jjMoveStringLiteralDfa6_3(active0, 0x400L);
  +      case 112:
  +         if ((active0 & 0x1000L) != 0L)
  +            return jjStopAtPos(5, 12);
  +         break;
         default :
            break;
      }
  -   return jjStartNfa_1(1, active0, 0L);
  +   return jjStartNfa_3(4, active0);
   }
  -private final int jjMoveStringLiteralDfa3_1(long old0, long active0)
  +private final int jjMoveStringLiteralDfa6_3(long old0, long active0)
   {
      if (((active0 &= old0)) == 0L)
  -      return jjStartNfa_1(1, old0, 0L);
  +      return jjStartNfa_3(4, old0); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_1(2, active0, 0L);
  -      return 3;
  +      jjStopStringLiteralDfa_3(5, active0);
  +      return 6;
      }
      switch(curChar)
      {
  -      case 101:
  -         if ((active0 & 0x40000000L) != 0L)
  -            return jjStartNfaWithStates_1(3, 30, 10);
  -         break;
  -      case 115:
  -         return jjMoveStringLiteralDfa4_1(active0, 0x80000000L);
  +      case 105:
  +         return jjMoveStringLiteralDfa7_3(active0, 0x400L);
         default :
            break;
      }
  -   return jjStartNfa_1(2, active0, 0L);
  +   return jjStartNfa_3(5, active0);
   }
  -private final int jjMoveStringLiteralDfa4_1(long old0, long active0)
  +private final int jjMoveStringLiteralDfa7_3(long old0, long active0)
   {
      if (((active0 &= old0)) == 0L)
  -      return jjStartNfa_1(2, old0, 0L);
  +      return jjStartNfa_3(5, old0); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_1(3, active0, 0L);
  -      return 4;
  +      jjStopStringLiteralDfa_3(6, active0);
  +      return 7;
      }
      switch(curChar)
      {
  -      case 101:
  -         if ((active0 & 0x80000000L) != 0L)
  -            return jjStartNfaWithStates_1(4, 31, 10);
  +      case 102:
  +         if ((active0 & 0x400L) != 0L)
  +            return jjStopAtPos(7, 10);
            break;
         default :
            break;
      }
  -   return jjStartNfa_1(3, active0, 0L);
  +   return jjStartNfa_3(6, active0);
   }
  -private final int jjMoveNfa_1(int startState, int curPos)
  +private final int jjMoveNfa_3(int startState, int curPos)
   {
      int[] nextStates;
      int startsAt = 0;
  -   jjnewStateCnt = 14;
  +   jjnewStateCnt = 13;
      int i = 1;
      jjstateSet[0] = startState;
      int j, kind = 0x7fffffff;
  @@ -3136,67 +3005,75 @@
            {
               switch(jjstateSet[--i])
               {
  -               case 4:
  -                  if (curChar == 46)
  -                     jjstateSet[jjnewStateCnt++] = 12;
  -                  else if (curChar == 34)
  -                     jjCheckNAddTwoStates(7, 8);
  -                  else if (curChar == 35)
  +               case 11:
  +                  if (curChar == 42)
  +                     jjstateSet[jjnewStateCnt++] = 9;
  +                  break;
  +               case 13:
  +                  if (curChar == 35)
                     {
  -                     if (kind > 20)
  -                        kind = 20;
  +                     if (kind > 19)
  +                        kind = 19;
                     }
                     else if (curChar == 36)
                     {
  -                     if (kind > 15)
  -                        kind = 15;
  +                     if (kind > 14)
  +                        kind = 14;
                     }
  -                  if (curChar == 35)
  -                     jjstateSet[jjnewStateCnt++] = 3;
  -                  break;
  -               case 0:
  -                  if (curChar == 36 && kind > 15)
  -                     kind = 15;
                     break;
  -               case 1:
  -                  if (curChar == 42)
  -                     jjstateSet[jjnewStateCnt++] = 2;
  +               case 8:
  +                  if ((0xffffffe7ffffffffL & l) != 0L)
  +                  {
  +                     if (kind > 21)
  +                        kind = 21;
  +                     jjCheckNAdd(7);
  +                  }
  +                  else if (curChar == 35)
  +                     jjCheckNAddTwoStates(3, 11);
  +                  else if (curChar == 36)
  +                  {
  +                     if (kind > 14)
  +                        kind = 14;
  +                  }
  +                  if ((0x100000200L & l) != 0L)
  +                     jjCheckNAddTwoStates(0, 4);
  +                  else if (curChar == 35)
  +                  {
  +                     if (kind > 19)
  +                        kind = 19;
  +                  }
                     break;
  -               case 2:
  -                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 18)
  -                     kind = 18;
  +               case 0:
  +                  if ((0x100000200L & l) != 0L)
  +                     jjCheckNAddTwoStates(0, 4);
                     break;
  -               case 3:
  -                  if (curChar == 42)
  -                     jjstateSet[jjnewStateCnt++] = 1;
  +               case 4:
  +                  if (curChar == 35)
  +                     jjCheckNAdd(3);
                     break;
                  case 5:
  -                  if (curChar == 35 && kind > 20)
  -                     kind = 20;
  +                  if (curChar == 36 && kind > 14)
  +                     kind = 14;
                     break;
                  case 6:
  -                  if (curChar == 34)
  -                     jjCheckNAddTwoStates(7, 8);
  +                  if (curChar == 35 && kind > 19)
  +                     kind = 19;
                     break;
                  case 7:
  -                  if ((0xfffffffbffffdbffL & l) != 0L)
  -                     jjCheckNAddTwoStates(7, 8);
  +                  if ((0xffffffe7ffffffffL & l) == 0L)
  +                     break;
  +                  if (kind > 21)
  +                     kind = 21;
  +                  jjCheckNAdd(7);
                     break;
  -               case 8:
  -                  if (curChar == 34 && kind > 29)
  -                     kind = 29;
  +               case 9:
  +                  if (curChar == 42)
  +                     jjstateSet[jjnewStateCnt++] = 10;
                     break;
                  case 10:
  -                  if ((0x3ff200000000000L & l) == 0L)
  -                     break;
  -                  if (kind > 61)
  -                     kind = 61;
  -                  jjstateSet[jjnewStateCnt++] = 10;
  +                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 17)
  +                     kind = 17;
                     break;
  -               case 11:
  -                  if (curChar == 46)
  -                     jjstateSet[jjnewStateCnt++] = 12;
  -                  break;
                  default : break;
               }
            } while(i != startsAt);
  @@ -3208,44 +3085,43 @@
            {
               switch(jjstateSet[--i])
               {
  -               case 4:
  -                  if ((0x7fffffe07fffffeL & l) != 0L)
  +               case 11:
  +               case 3:
  +                  if (curChar == 115)
  +                     jjstateSet[jjnewStateCnt++] = 2;
  +                  break;
  +               case 8:
  +                  if ((0xffffffffefffffffL & l) != 0L)
                     {
  -                     if (kind > 61)
  -                        kind = 61;
  -                     jjCheckNAdd(10);
  +                     if (kind > 21)
  +                        kind = 21;
  +                     jjCheckNAdd(7);
                     }
                     else if (curChar == 92)
  -                     jjAddStates(7, 8);
  +                     jjAddStates(14, 15);
  +                  break;
  +               case 1:
  +                  if (curChar == 116 && kind > 13)
  +                     kind = 13;
                     break;
                  case 2:
  -                  if (kind > 18)
  -                     kind = 18;
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 1;
                     break;
                  case 7:
  -                  jjAddStates(14, 15);
  -                  break;
  -               case 9:
  -                  if ((0x7fffffe07fffffeL & l) == 0L)
  +                  if ((0xffffffffefffffffL & l) == 0L)
                        break;
  -                  if (kind > 61)
  -                     kind = 61;
  -                  jjCheckNAdd(10);
  +                  if (kind > 21)
  +                     kind = 21;
  +                  jjCheckNAdd(7);
                     break;
                  case 10:
  -                  if ((0x7fffffe87fffffeL & l) == 0L)
  -                     break;
  -                  if (kind > 61)
  -                     kind = 61;
  -                  jjCheckNAdd(10);
  +                  if (kind > 17)
  +                     kind = 17;
                     break;
                  case 12:
  -                  if ((0x7fffffe07fffffeL & l) != 0L && kind > 62)
  -                     kind = 62;
  -                  break;
  -               case 13:
                     if (curChar == 92)
  -                     jjAddStates(7, 8);
  +                     jjAddStates(14, 15);
                     break;
                  default : break;
               }
  @@ -3259,13 +3135,17 @@
            {
               switch(jjstateSet[--i])
               {
  -               case 2:
  -                  if ((jjbitVec0[i2] & l2) != 0L && kind > 18)
  -                     kind = 18;
  -                  break;
  +               case 8:
                  case 7:
  -                  if ((jjbitVec0[i2] & l2) != 0L)
  -                     jjAddStates(14, 15);
  +                  if ((jjbitVec0[i2] & l2) == 0L)
  +                     break;
  +                  if (kind > 21)
  +                     kind = 21;
  +                  jjCheckNAdd(7);
  +                  break;
  +               case 10:
  +                  if ((jjbitVec0[i2] & l2) != 0L && kind > 17)
  +                     kind = 17;
                     break;
                  default : break;
               }
  @@ -3278,21 +3158,21 @@
            kind = 0x7fffffff;
         }
         ++curPos;
  -      if ((i = jjnewStateCnt) == (startsAt = 14 - (jjnewStateCnt = startsAt)))
  +      if ((i = jjnewStateCnt) == (startsAt = 13 - (jjnewStateCnt = startsAt)))
            return curPos;
         try { curChar = input_stream.readChar(); }
         catch(java.io.IOException e) { return curPos; }
      }
   }
   static final int[] jjnextStates = {
  -   1, 2, 4, 5, 10, 12, 13, 0, 5, 7, 8, 10, 5, 6, 7, 8, 
  +   1, 2, 4, 5, 10, 12, 13, 0, 5, 7, 8, 7, 8, 10, 5, 6, 
   };
   public static final String[] jjstrLiteralImages = {
   null, null, null, null, null, null, null, null, null, null, null, null, null, 
   null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
   null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
   null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
  -null, null, null, null, null, null, null, null, null, null, null, null, };
  +null, null, null, null, null, null, null, null, null, null, };
   public static final String[] lexStateNames = {
      "DIRECTIVE", 
      "REFMODIFIER", 
  @@ -3307,19 +3187,19 @@
   public static final int[] jjnewLexState = {
      -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-1, -1, -1, -1, -1, 
      -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-1, -1, -1, -1, -1, 
  -   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
  +   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   };
   static final long[] jjtoToken = {
  -   0xe2bfffffe3e07fffL, 0x1L, 
  +   0x78affffff1f03fffL, 0x0L, 
   };
   static final long[] jjtoSkip = {
  -   0x18000000L, 0x6L, 
  +   0x800000000c000000L, 0x1L, 
   };
   static final long[] jjtoSpecial = {
  -   0x0L, 0x6L, 
  +   0x8000000000000000L, 0x1L, 
   };
   static final long[] jjtoMore = {
  -   0x41f8000L, 0x0L, 
  +   0x20fc000L, 0x0L, 
   };
   private ASCII_CharStream input_stream;
   private final int[] jjrounds = new int[20];
  @@ -3429,9 +3309,9 @@
            jjmatchedKind = 0x7fffffff;
            jjmatchedPos = 0;
            curPos = jjMoveStringLiteralDfa0_1();
  -         if (jjmatchedPos == 0 && jjmatchedKind > 65)
  +         if (jjmatchedPos == 0 && jjmatchedKind > 63)
            {
  -            jjmatchedKind = 65;
  +            jjmatchedKind = 63;
            }
            break;
          case 2:
  @@ -3443,9 +3323,9 @@
            jjmatchedKind = 0x7fffffff;
            jjmatchedPos = 0;
            curPos = jjMoveStringLiteralDfa0_2();
  -         if (jjmatchedPos == 0 && jjmatchedKind > 65)
  +         if (jjmatchedPos == 0 && jjmatchedKind > 63)
            {
  -            jjmatchedKind = 65;
  +            jjmatchedKind = 63;
            }
            break;
          case 3:
  @@ -3457,45 +3337,45 @@
            jjmatchedKind = 0x7fffffff;
            jjmatchedPos = 0;
            curPos = jjMoveStringLiteralDfa0_4();
  -         if (jjmatchedPos == 0 && jjmatchedKind > 66)
  +         if (jjmatchedPos == 0 && jjmatchedKind > 64)
            {
  -            jjmatchedKind = 66;
  +            jjmatchedKind = 64;
            }
            break;
          case 5:
            jjmatchedKind = 0x7fffffff;
            jjmatchedPos = 0;
            curPos = jjMoveStringLiteralDfa0_5();
  -         if (jjmatchedPos == 0 && jjmatchedKind > 65)
  +         if (jjmatchedPos == 0 && jjmatchedKind > 63)
            {
  -            jjmatchedKind = 65;
  +            jjmatchedKind = 63;
            }
            break;
          case 6:
            jjmatchedKind = 0x7fffffff;
            jjmatchedPos = 0;
            curPos = jjMoveStringLiteralDfa0_6();
  -         if (jjmatchedPos == 0 && jjmatchedKind > 26)
  +         if (jjmatchedPos == 0 && jjmatchedKind > 25)
            {
  -            jjmatchedKind = 26;
  +            jjmatchedKind = 25;
            }
            break;
          case 7:
            jjmatchedKind = 0x7fffffff;
            jjmatchedPos = 0;
            curPos = jjMoveStringLiteralDfa0_7();
  -         if (jjmatchedPos == 0 && jjmatchedKind > 26)
  +         if (jjmatchedPos == 0 && jjmatchedKind > 25)
            {
  -            jjmatchedKind = 26;
  +            jjmatchedKind = 25;
            }
            break;
          case 8:
            jjmatchedKind = 0x7fffffff;
            jjmatchedPos = 0;
            curPos = jjMoveStringLiteralDfa0_8();
  -         if (jjmatchedPos == 0 && jjmatchedKind > 26)
  +         if (jjmatchedPos == 0 && jjmatchedKind > 25)
            {
  -            jjmatchedKind = 26;
  +            jjmatchedKind = 25;
            }
            break;
        }
  @@ -3572,7 +3452,7 @@
   {
      switch(jjmatchedKind)
      {
  -      case 65 :
  +      case 63 :
            if (image == null)
               image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + 
(lengthOfMatch = jjmatchedPos + 1))));
            else
  @@ -3590,7 +3470,7 @@
   
           stateStackPop();
            break;
  -      case 66 :
  +      case 64 :
            if (image == null)
               image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + 
(lengthOfMatch = jjmatchedPos + 1))));
            else
  @@ -3611,7 +3491,7 @@
      jjimageLen += (lengthOfMatch = jjmatchedPos + 1);
      switch(jjmatchedKind)
      {
  -      case 15 :
  +      case 14 :
            if (image == null)
                 image = new StringBuffer(new 
String(input_stream.GetSuffix(jjimageLen)));
            else
  @@ -3628,7 +3508,7 @@
               SwitchTo(REFERENCE);
           }
            break;
  -      case 16 :
  +      case 15 :
            if (image == null)
                 image = new StringBuffer(new 
String(input_stream.GetSuffix(jjimageLen)));
            else
  @@ -3645,7 +3525,7 @@
               SwitchTo(REFERENCE);
           }
            break;
  -      case 17 :
  +      case 16 :
            if (image == null)
                 image = new StringBuffer(new 
String(input_stream.GetSuffix(jjimageLen)));
            else
  @@ -3655,7 +3535,7 @@
           stateStackPush();
           SwitchTo(IN_SINGLE_LINE_COMMENT);
            break;
  -      case 18 :
  +      case 17 :
            if (image == null)
                 image = new StringBuffer(new 
String(input_stream.GetSuffix(jjimageLen)));
            else
  @@ -3666,7 +3546,7 @@
           stateStackPush();
           SwitchTo( IN_FORMAL_COMMENT);
            break;
  -      case 19 :
  +      case 18 :
            if (image == null)
                 image = new StringBuffer(new 
String(input_stream.GetSuffix(jjimageLen)));
            else
  @@ -3676,7 +3556,7 @@
           stateStackPush();
           SwitchTo( IN_MULTI_LINE_COMMENT );
            break;
  -      case 20 :
  +      case 19 :
            if (image == null)
                 image = new StringBuffer(new 
String(input_stream.GetSuffix(jjimageLen)));
            else
  @@ -3761,30 +3641,23 @@
               image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + 
(lengthOfMatch = jjmatchedPos + 1))));
            else
               image.append(new String(input_stream.GetSuffix(jjimageLen + 
(lengthOfMatch = jjmatchedPos + 1))));
  -       matchedToken.image = "#include";
  -         break;
  -      case 11 :
  -        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))));
          matchedToken.image = "#elseif";
            break;
  -      case 12 :
  +      case 11 :
           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))));
          matchedToken.image = "#else";
            break;
  -      case 13 :
  +      case 12 :
           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))));
          matchedToken.image = "#stop";
            break;
  -      case 14 :
  +      case 13 :
           if (image == null)
               image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + 
(lengthOfMatch = jjmatchedPos + 1))));
            else
  @@ -3801,7 +3674,7 @@
               SwitchTo(DIRECTIVE);
           }
            break;
  -      case 23 :
  +      case 22 :
           if (image == null)
               image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + 
(lengthOfMatch = jjmatchedPos + 1))));
            else
  @@ -3809,7 +3682,7 @@
        inComment = false;
        stateStackPop();
            break;
  -      case 24 :
  +      case 23 :
           if (image == null)
               image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + 
(lengthOfMatch = jjmatchedPos + 1))));
            else
  @@ -3817,7 +3690,7 @@
       inComment = false;
       stateStackPop();
            break;
  -      case 25 :
  +      case 24 :
           if (image == null)
               image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + 
(lengthOfMatch = jjmatchedPos + 1))));
            else
  @@ -3825,18 +3698,11 @@
       inComment = false;
       stateStackPop();
            break;
  -      case 29 :
  +      case 28 :
           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))));
  -        if (incMode)
  -        {
  -            matchedToken.image = stripQuotes(image.toString());
  -            pushFile(matchedToken.image);
  -        }
  -        incMode = false;
  -
           /*
            *  - if we are in REFERENCE || REFMODIFIER then " is an ender
            *  - if we are in DIRECTIVE and haven't seen ( yet, then also drop out. 
  @@ -3849,7 +3715,7 @@
           else if( curLexState == DIRECTIVE && !inSet && lparen == 0)
               stateStackPop();
            break;
  -      case 32 :
  +      case 31 :
           if (image == null)
               image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + 
(lengthOfMatch = jjmatchedPos + 1))));
            else
  @@ -3865,37 +3731,29 @@
           if (inDirective)
               inDirective = false;
            break;
  -      case 48 :
  +      case 47 :
           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))));
           inDirective = false;
           stateStackPop();
  -         break;
  -      case 49 :
  -        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))));
  -        incMode = true;
  -        SwitchTo(DIRECTIVE);
            break;
  -      case 50 :
  +      case 48 :
           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))));
           SwitchTo(DIRECTIVE);
            break;
  -      case 51 :
  +      case 49 :
           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))));
           SwitchTo(DIRECTIVE);
            break;
  -      case 52 :
  +      case 50 :
           if (image == null)
               image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + 
(lengthOfMatch = jjmatchedPos + 1))));
            else
  @@ -3903,7 +3761,7 @@
           inDirective = false;
           stateStackPop();
            break;
  -      case 53 :
  +      case 51 :
           if (image == null)
               image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + 
(lengthOfMatch = jjmatchedPos + 1))));
            else
  @@ -3911,14 +3769,13 @@
           matchedToken.kind = EOF;
           fileDepth = 0;
            break;
  -      case 55 :
  +      case 53 :
           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))));
           /*
  -         *  in the spirit of Jason's fix :)
  -         *  but check to see if we are in set
  +         * check to see if we are in set
            *    ex.  #set $foo = $foo + 3
            *  because we want to handle the \n after
            */
  @@ -3926,7 +3783,7 @@
           if ( lparen == 0 && !inSet && curLexState != REFMOD2)
               stateStackPop();
            break;
  -      case 62 :
  +      case 60 :
           if (image == null)
               image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + 
(lengthOfMatch = jjmatchedPos + 1))));
            else
  @@ -3947,7 +3804,7 @@
               System.out.print("DOT : switching to " + REFMODIFIER);
           SwitchTo(REFMODIFIER);
            break;
  -      case 64 :
  +      case 62 :
           if (image == null)
               image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + 
(lengthOfMatch = jjmatchedPos + 1))));
            else
  
  
  

Reply via email to