velocity-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@locus.apache.org
Subject cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime/parser Parser.java Parser.jj ParserTokenManager.java
Date Wed, 01 Nov 2000 23:16:07 GMT
geirm       00/11/01 15:16:06

  Modified:    src/java/org/apache/velocity/runtime/parser Parser.java
                        Parser.jj ParserTokenManager.java
  Log:
  To match current Parser.jjt
  
  Revision  Changes    Path
  1.14      +368 -368  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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Parser.java	2000/11/01 18:22:22	1.13
  +++ Parser.java	2000/11/01 23:15:56	1.14
  @@ -18,7 +18,7 @@
    *
    * @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
    * @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
  - * @version $Id: Parser.java,v 1.13 2000/11/01 18:22:22 jvanzyl Exp $ 
  + * @version $Id: Parser.java,v 1.14 2000/11/01 23:15:56 geirm Exp $ 
   */
   public class Parser/*@bgen(jjtree)*/implements ParserTreeConstants, ParserConstants {/*@bgen(jjtree)*/
     protected JJTParserState jjtree = new JJTParserState();
  @@ -63,7 +63,7 @@
   
           try {
               n = process();
  -        } catch (Exception e) { e.printStackTrace();}
  +        } catch (Exception e) { System.out.println(e);}
   
           return n;
       }
  @@ -141,12 +141,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) {
  @@ -409,12 +409,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) {
  @@ -432,12 +432,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) {
  @@ -488,12 +488,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) {
  @@ -579,12 +579,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) {
  @@ -653,12 +653,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) {
  @@ -801,12 +801,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) {
  @@ -848,12 +848,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) {
  @@ -909,12 +909,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) {
  @@ -928,12 +928,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) {
  @@ -992,12 +992,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) {
  @@ -1011,12 +1011,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) {
  @@ -1048,12 +1048,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) {
  @@ -1126,12 +1126,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) {
  @@ -1156,12 +1156,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) {
  @@ -1195,12 +1195,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) {
  @@ -1235,12 +1235,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) {
  @@ -1278,12 +1278,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) {
  @@ -1305,12 +1305,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) {
  @@ -1356,12 +1356,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) {
  @@ -1383,12 +1383,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) {
  @@ -1410,12 +1410,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) {
  @@ -1437,12 +1437,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) {
  @@ -1486,12 +1486,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) {
  @@ -1513,12 +1513,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) {
  @@ -1563,12 +1563,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) {
  @@ -1590,12 +1590,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) {
  @@ -1617,12 +1617,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) {
  @@ -1654,12 +1654,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) {
  @@ -1738,580 +1738,580 @@
       return retval;
     }
   
  -  final private boolean jj_3R_26() {
  -    if (jj_3R_34()) return true;
  +  final private boolean jj_3R_55() {
  +    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_25() {
  -    if (jj_3R_33()) return true;
  +  final private boolean jj_3R_53() {
  +    if (jj_3R_56()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    Token xsp;
  +    while (true) {
  +      xsp = jj_scanpos;
  +      if (jj_3R_57()) { 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_54() {
  +    if (jj_scan_token(LOGICAL_AND)) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_3R_53()) 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_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_22() {
  -    if (jj_3R_30()) return true;
  +  final private boolean jj_3R_51() {
  +    if (jj_3R_53()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    Token xsp;
  +    while (true) {
  +      xsp = jj_scanpos;
  +      if (jj_3R_54()) { jj_scanpos = xsp; break; }
  +      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    }
       return false;
     }
   
  -  final private boolean jj_3R_19() {
  -    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()) {
  -    jj_scanpos = xsp;
  -    if (jj_3R_26()) {
  -    jj_scanpos = xsp;
  -    if (jj_3R_27()) {
  -    jj_scanpos = xsp;
  -    if (jj_3R_28()) 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;
  -    } 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_41() {
  -    if (jj_3R_32()) return true;
  +  final private boolean jj_3R_52() {
  +    if (jj_scan_token(LOGICAL_OR)) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_3R_51()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_73() {
  +  final private boolean jj_3_3() {
       if (jj_3R_19()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    return false;
  -  }
  -
  -  final private boolean jj_3R_40() {
  -    if (jj_3R_35()) return true;
  +    if (jj_scan_token(EQUALS)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_44() {
  +  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_48()) { 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_76() {
  -    if (jj_scan_token(MODULUS)) return true;
  +  final private boolean jj_3R_50() {
  +    if (jj_3R_51()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_68()) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    Token xsp;
  +    while (true) {
  +      xsp = jj_scanpos;
  +      if (jj_3R_52()) { jj_scanpos = xsp; break; }
  +      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    }
       return false;
     }
   
  -  final private boolean jj_3R_72() {
  -    if (jj_scan_token(LOGICAL_NOT)) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_68()) 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_68() {
  -    Token xsp;
  -    xsp = jj_scanpos;
  -    if (jj_3R_72()) {
  -    jj_scanpos = xsp;
  -    if (jj_3R_73()) return true;
  +  final private boolean jj_3R_49() {
  +    if (jj_3R_19()) 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_39() {
  -    if (jj_3R_34()) 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_75() {
  -    if (jj_scan_token(DIVIDE)) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_68()) 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_46() {
  +    if (jj_3R_50()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_74() {
  -    if (jj_scan_token(MULTIPLY)) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_68()) return true;
  +  final private boolean jj_3R_45() {
  +    if (jj_3R_49()) 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_36() {
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_74()) {
  -    jj_scanpos = xsp;
  -    if (jj_3R_75()) {
  +    if (jj_3R_45()) {
       jj_scanpos = xsp;
  -    if (jj_3R_76()) return true;
  +    if (jj_3R_46()) 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_29() {
  +  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()) {
  +    if (jj_3_2()) {
       jj_scanpos = xsp;
  -    if (jj_3R_41()) 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;
  +    xsp = jj_scanpos;
  +    if (jj_3R_47()) 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_43() {
  +    if (jj_scan_token(RCURLY)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_71() {
  -    if (jj_scan_token(MINUS)) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_62()) 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;
       return false;
     }
   
  -  final private boolean jj_3R_62() {
  -    if (jj_3R_68()) return true;
  +  final private boolean jj_3R_42() {
  +    if (jj_scan_token(LCURLY)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    Token xsp;
  -    while (true) {
  -      xsp = jj_scanpos;
  -      if (jj_3R_69()) { jj_scanpos = xsp; break; }
  -      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    }
       return false;
     }
   
  -  final private boolean jj_3R_70() {
  -    if (jj_scan_token(PLUS)) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_62()) 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;
       return false;
     }
   
  -  final private boolean jj_3R_63() {
  +  final private boolean jj_3R_32() {
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_70()) {
  -    jj_scanpos = xsp;
  -    if (jj_3R_71()) return true;
  +    if (jj_3R_42()) 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;
  -    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    xsp = jj_scanpos;
  +    if (jj_3R_43()) 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;
  +    }
       return false;
     }
   
  -  final private boolean jj_3R_47() {
  -    if (jj_scan_token(RCURLY)) return true;
  +  final private boolean jj_3R_48() {
  +    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_33() {
  -    if (jj_scan_token(LBRACKET)) return true;
  +  final private boolean jj_3R_18() {
  +    if (jj_3R_20()) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    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_44()) 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_67() {
  -    if (jj_scan_token(LOGICAL_GE)) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_58()) 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_58() {
  -    if (jj_3R_62()) return true;
  +  final private boolean jj_3R_44() {
  +    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_63()) { jj_scanpos = xsp; break; }
  +      if (jj_3R_48()) { jj_scanpos = xsp; break; }
         if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       }
       return false;
     }
   
  -  final private boolean jj_3R_66() {
  -    if (jj_scan_token(LOGICAL_LE)) return true;
  +  final private boolean jj_3R_40() {
  +    if (jj_3R_35()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_58()) return true;
  +    return false;
  +  }
  +
  +  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_65() {
  -    if (jj_scan_token(LOGICAL_GT)) 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_58()) 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_64() {
  -    if (jj_scan_token(LOGICAL_LT)) return true;
  +  final private boolean jj_3R_38() {
  +    if (jj_3R_33()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_58()) return true;
  +    return false;
  +  }
  +
  +  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_59() {
  +  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_29() {
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_64()) {
  +    if (jj_3R_37()) {
       jj_scanpos = xsp;
  -    if (jj_3R_65()) {
  +    if (jj_3R_38()) {
       jj_scanpos = xsp;
  -    if (jj_3R_66()) {
  +    if (jj_3R_39()) {
       jj_scanpos = xsp;
  -    if (jj_3R_67()) return true;
  +    if (jj_3R_40()) {
  +    jj_scanpos = xsp;
  +    if (jj_3R_41()) 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;
       return false;
     }
   
  -  final private boolean jj_3R_17() {
  -    if (jj_3R_20()) 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_61() {
  -    if (jj_scan_token(LOGICAL_NOT_EQUALS)) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_56()) return true;
  +  final private boolean jj_3R_25() {
  +    if (jj_3R_33()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_56() {
  -    if (jj_3R_58()) return true;
  +  final private boolean jj_3R_24() {
  +    if (jj_3R_32()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    Token xsp;
  -    while (true) {
  -      xsp = jj_scanpos;
  -      if (jj_3R_59()) { jj_scanpos = xsp; break; }
  -      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    }
       return false;
     }
   
  -  final private boolean jj_3R_60() {
  -    if (jj_scan_token(LOGICAL_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;
  -    if (jj_3R_56()) return true;
  +    return false;
  +  }
  +
  +  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_57() {
  +  final private boolean jj_3R_19() {
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_60()) {
  +    if (jj_3R_22()) {
       jj_scanpos = xsp;
  -    if (jj_3R_61()) 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_53() {
  -    if (jj_3R_56()) return true;
  +  final private boolean jj_3R_73() {
  +    if (jj_3R_19()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    Token xsp;
  -    while (true) {
  -      xsp = jj_scanpos;
  -      if (jj_3R_57()) { jj_scanpos = xsp; break; }
  -      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    }
       return false;
     }
   
  -  final private boolean jj_3R_54() {
  -    if (jj_scan_token(LOGICAL_AND)) return true;
  +  final private boolean jj_3R_76() {
  +    if (jj_scan_token(MODULUS)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_53()) return true;
  +    if (jj_3R_68()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_55() {
  -    if (jj_scan_token(COMMA)) return true;
  +  final private boolean jj_3R_72() {
  +    if (jj_scan_token(LOGICAL_NOT)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_29()) return true;
  +    if (jj_3R_68()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_51() {
  -    if (jj_3R_53()) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +  final private boolean jj_3R_68() {
       Token xsp;
  -    while (true) {
  -      xsp = jj_scanpos;
  -      if (jj_3R_54()) { jj_scanpos = xsp; break; }
  -      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    }
  +    xsp = jj_scanpos;
  +    if (jj_3R_72()) {
  +    jj_scanpos = xsp;
  +    if (jj_3R_73()) 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_52() {
  -    if (jj_scan_token(LOGICAL_OR)) return true;
  +  final private boolean jj_3R_33() {
  +    if (jj_scan_token(LBRACKET)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_51()) return true;
  +    Token xsp;
  +    xsp = jj_scanpos;
  +    if (jj_3R_44()) 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;
       return false;
     }
   
  -  final private boolean jj_3_2() {
  -    if (jj_3R_18()) return true;
  +  final private boolean jj_3R_75() {
  +    if (jj_scan_token(DIVIDE)) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_3R_68()) 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;
  +  final private boolean jj_3R_74() {
  +    if (jj_scan_token(MULTIPLY)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_scan_token(EQUALS)) return true;
  +    if (jj_3R_68()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_50() {
  -    if (jj_3R_51()) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +  final private boolean jj_3R_69() {
       Token xsp;
  -    while (true) {
  -      xsp = jj_scanpos;
  -      if (jj_3R_52()) { jj_scanpos = xsp; break; }
  -      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    }
  +    xsp = jj_scanpos;
  +    if (jj_3R_74()) {
  +    jj_scanpos = xsp;
  +    if (jj_3R_75()) {
  +    jj_scanpos = xsp;
  +    if (jj_3R_76()) 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_49() {
  -    if (jj_3R_19()) return true;
  +  final private boolean jj_3R_47() {
  +    if (jj_scan_token(RCURLY)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_scan_token(EQUALS)) return true;
  +    return false;
  +  }
  +
  +  final private boolean jj_3R_71() {
  +    if (jj_scan_token(MINUS)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_36()) return true;
  +    if (jj_3R_62()) 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_62() {
  +    if (jj_3R_68()) 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_3R_69()) { jj_scanpos = xsp; break; }
         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;
  -    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_70() {
  +    if (jj_scan_token(PLUS)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    return false;
  -  }
  -
  -  final private boolean jj_3R_46() {
  -    if (jj_3R_50()) return true;
  +    if (jj_3R_62()) 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_63() {
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_45()) {
  +    if (jj_3R_70()) {
       jj_scanpos = xsp;
  -    if (jj_3R_46()) return true;
  +    if (jj_3R_71()) 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_45() {
  -    if (jj_3R_49()) return true;
  +  final private boolean jj_3R_67() {
  +    if (jj_scan_token(LOGICAL_GE)) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_3R_58()) 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_58() {
  +    if (jj_3R_62()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    Token xsp;
  +    while (true) {
  +      xsp = jj_scanpos;
  +      if (jj_3R_63()) { 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;
  +  final private boolean jj_3R_66() {
  +    if (jj_scan_token(LOGICAL_LE)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    Token xsp;
  -    xsp = jj_scanpos;
  -    if (jj_3_2()) {
  -    jj_scanpos = xsp;
  -    if (jj_3R_17()) return true;
  +    if (jj_3R_58()) 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_47()) jj_scanpos = xsp;
  -    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_43() {
  -    if (jj_scan_token(RCURLY)) return true;
  +  final private boolean jj_3R_65() {
  +    if (jj_scan_token(LOGICAL_GT)) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_3R_58()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_42() {
  -    if (jj_scan_token(LCURLY)) 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_30() {
  -    if (jj_scan_token(STRING_LITERAL)) return true;
  +  final private boolean jj_3R_64() {
  +    if (jj_scan_token(LOGICAL_LT)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_3R_58()) 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_59() {
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_42()) jj_scanpos = xsp;
  -    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_scan_token(IDENTIFIER)) return true;
  +    if (jj_3R_64()) {
  +    jj_scanpos = xsp;
  +    if (jj_3R_65()) {
  +    jj_scanpos = xsp;
  +    if (jj_3R_66()) {
  +    jj_scanpos = xsp;
  +    if (jj_3R_67()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    xsp = jj_scanpos;
  -    if (jj_3R_43()) 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;
  +    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_48() {
  -    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_61() {
  +    if (jj_scan_token(LOGICAL_NOT_EQUALS)) return true;
       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_3R_56()) 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;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_scan_token(LPAREN)) return true;
  +  final private boolean jj_3R_56() {
  +    if (jj_3R_58()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       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_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    while (true) {
  +      xsp = jj_scanpos;
  +      if (jj_3R_59()) { jj_scanpos = xsp; break; }
  +      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;
  +  final private boolean jj_3R_60() {
  +    if (jj_scan_token(LOGICAL_EQUALS)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_scan_token(RPAREN)) return true;
  +    if (jj_3R_56()) return true;
       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_57() {
  +    Token xsp;
  +    xsp = jj_scanpos;
  +    if (jj_3R_60()) {
  +    jj_scanpos = xsp;
  +    if (jj_3R_61()) 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;
     }
   
  
  
  
  1.14      +107 -88   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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Parser.jj	2000/11/01 18:22:25	1.13
  +++ Parser.jj	2000/11/01 23:15:57	1.14
  @@ -53,6 +53,25 @@
    * <http://www.apache.org/>.
    */
   
  +/*
  + *  Background
  + *  ----------
  + *
  + *  VTL == Velocity Template Language
  + *
  + *  The problem with parsing VTL is that an input stream consists generally of little
  + *  bits of VTL mixed in with 'other stuff' (hereafter referred to as 'schmoo').  Unlike
  + *  other languages, like C or Java, where the parser can punt whenever it encounters 
  + *  input that doesn't conform to the grammar, the VTL parser can't do that.  
  + *
  + *  There are a few things that we do here :
  + *    - define a set of parser states (DEFAULT, DIRECTIVE, REFERENCE, etc)
  + *    - define for each parser state a set of tokens for each state
  + *    - define the VTL grammar, expressed (mostly) in the productions such as Text(), SetStatement(), etc.
  + *  
  + *   (cont)
  + */
  + 
   options
   {                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       
       
  @@ -98,7 +117,7 @@
    *
    * @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
    * @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
  - * @version $Id: Parser.jj,v 1.13 2000/11/01 18:22:25 jvanzyl Exp $ 
  + * @version $Id: Parser.jj,v 1.14 2000/11/01 23:15:57 geirm Exp $ 
   */
   public class Parser/*@bgen(jjtree)*/implements ParserTreeConstants/*@egen*/
   {/*@bgen(jjtree)*/
  @@ -833,12 +852,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) {
  @@ -1026,12 +1045,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) {
  @@ -1055,12 +1074,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) {
  @@ -1086,12 +1105,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) {
  @@ -1136,12 +1155,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) {
  @@ -1173,12 +1192,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) {
  @@ -1293,12 +1312,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) {
  @@ -1316,12 +1335,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) {
  @@ -1355,12 +1374,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) {
  @@ -1375,12 +1394,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) {
  @@ -1415,12 +1434,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) {
  @@ -1435,12 +1454,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) {
  @@ -1466,12 +1485,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) {
  @@ -1530,12 +1549,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) {
  @@ -1561,12 +1580,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) {
  @@ -1594,12 +1613,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) {
  @@ -1628,12 +1647,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) {
  @@ -1662,12 +1681,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) {
  @@ -1690,12 +1709,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) {
  @@ -1725,12 +1744,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) {
  @@ -1753,12 +1772,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) {
  @@ -1781,12 +1800,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) {
  @@ -1809,12 +1828,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) {
  @@ -1844,12 +1863,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) {
  @@ -1872,12 +1891,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) {
  @@ -1907,12 +1926,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) {
  @@ -1935,12 +1954,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) {
  @@ -1963,12 +1982,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) {
  @@ -1996,11 +2015,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.13      +937 -937  jakarta-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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ParserTokenManager.java	2000/11/01 18:22:26	1.12
  +++ ParserTokenManager.java	2000/11/01 23:15:57	1.13
  @@ -220,338 +220,164 @@
               }
           }
       }
  -private final int jjStopStringLiteralDfa_7(int pos, long active0)
  +private final int jjStopStringLiteralDfa_0(int pos, long active0)
   {
      switch (pos)
      {
         case 0:
  -         if ((active0 & 0x1a00L) != 0L)
  -            return 2;
  -         return -1;
  -      default :
  -         return -1;
  -   }
  -}
  -private final int jjStartNfa_7(int pos, long active0)
  -{
  -   return jjMoveNfa_7(jjStopStringLiteralDfa_7(pos, active0), pos + 1);
  -}
  -private final int jjStopAtPos(int pos, int kind)
  -{
  -   jjmatchedKind = kind;
  -   jjmatchedPos = pos;
  -   return pos + 1;
  -}
  -private final int jjStartNfaWithStates_7(int pos, int kind, int state)
  -{
  -   jjmatchedKind = kind;
  -   jjmatchedPos = pos;
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) { return pos + 1; }
  -   return jjMoveNfa_7(state, pos + 1);
  -}
  -private final int jjMoveStringLiteralDfa0_7()
  -{
  -   switch(curChar)
  -   {
  -      case 35:
  -         jjmatchedKind = 12;
  -         return jjMoveStringLiteralDfa1_7(0xa00L);
  -      case 36:
  -         jjmatchedKind = 7;
  -         return jjMoveStringLiteralDfa1_7(0x100L);
  -      default :
  -         return jjMoveNfa_7(3, 0);
  -   }
  -}
  -private final int jjMoveStringLiteralDfa1_7(long active0)
  -{
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_7(0, active0);
  -      return 1;
  -   }
  -   switch(curChar)
  -   {
  -      case 33:
  -         if ((active0 & 0x100L) != 0L)
  -            return jjStopAtPos(1, 8);
  -         break;
  -      case 35:
  -         if ((active0 & 0x200L) != 0L)
  -            return jjStopAtPos(1, 9);
  -         break;
  -      case 42:
  -         if ((active0 & 0x800L) != 0L)
  -            return jjStartNfaWithStates_7(1, 11, 0);
  -         break;
  -      default :
  -         break;
  -   }
  -   return jjStartNfa_7(0, active0);
  -}
  -private final void jjCheckNAdd(int state)
  -{
  -   if (jjrounds[state] != jjround)
  -   {
  -      jjstateSet[jjnewStateCnt++] = state;
  -      jjrounds[state] = jjround;
  -   }
  -}
  -private final void jjAddStates(int start, int end)
  -{
  -   do {
  -      jjstateSet[jjnewStateCnt++] = jjnextStates[start];
  -   } while (start++ != end);
  -}
  -private final void jjCheckNAddTwoStates(int state1, int state2)
  -{
  -   jjCheckNAdd(state1);
  -   jjCheckNAdd(state2);
  -}
  -private final void jjCheckNAddStates(int start, int end)
  -{
  -   do {
  -      jjCheckNAdd(jjnextStates[start]);
  -   } while (start++ != end);
  -}
  -private final void jjCheckNAddStates(int start)
  -{
  -   jjCheckNAdd(jjnextStates[start]);
  -   jjCheckNAdd(jjnextStates[start + 1]);
  -}
  -static final long[] jjbitVec0 = {
  -   0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL
  -};
  -private final int jjMoveNfa_7(int startState, int curPos)
  -{
  -   int[] nextStates;
  -   int startsAt = 0;
  -   jjnewStateCnt = 7;
  -   int i = 1;
  -   jjstateSet[0] = startState;
  -   int j, kind = 0x7fffffff;
  -   for (;;)
  -   {
  -      if (++jjround == 0x7fffffff)
  -         ReInitRounds();
  -      if (curChar < 64)
  -      {
  -         long l = 1L << curChar;
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 3:
  -                  if ((0xffffffe7ffffffffL & l) != 0L)
  -                  {
  -                     if (kind > 14)
  -                        kind = 14;
  -                     jjCheckNAdd(6);
  -                  }
  -                  else if (curChar == 35)
  -                     jjstateSet[jjnewStateCnt++] = 2;
  -                  break;
  -               case 0:
  -                  if (curChar == 42)
  -                     jjstateSet[jjnewStateCnt++] = 1;
  -                  break;
  -               case 1:
  -                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 10)
  -                     kind = 10;
  -                  break;
  -               case 2:
  -                  if (curChar == 42)
  -                     jjstateSet[jjnewStateCnt++] = 0;
  -                  break;
  -               case 5:
  -                  if (kind > 13)
  -                     kind = 13;
  -                  break;
  -               case 6:
  -                  if ((0xffffffe7ffffffffL & l) == 0L)
  -                     break;
  -                  if (kind > 14)
  -                     kind = 14;
  -                  jjCheckNAdd(6);
  -                  break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      else if (curChar < 128)
  -      {
  -         long l = 1L << (curChar & 077);
  -         MatchLoop: do
  -         {
  -            switch(jjstateSet[--i])
  -            {
  -               case 3:
  -                  if ((0xffffffffefffffffL & l) != 0L)
  -                  {
  -                     if (kind > 14)
  -                        kind = 14;
  -                     jjCheckNAdd(6);
  -                  }
  -                  else if (curChar == 92)
  -                     jjstateSet[jjnewStateCnt++] = 5;
  -                  break;
  -               case 1:
  -                  if (kind > 10)
  -                     kind = 10;
  -                  break;
  -               case 4:
  -                  if (curChar == 92)
  -                     jjstateSet[jjnewStateCnt++] = 5;
  -                  break;
  -               case 5:
  -                  if (kind > 13)
  -                     kind = 13;
  -                  break;
  -               case 6:
  -                  if ((0xffffffffefffffffL & l) == 0L)
  -                     break;
  -                  if (kind > 14)
  -                     kind = 14;
  -                  jjCheckNAdd(6);
  -                  break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      else
  -      {
  -         int i2 = (curChar & 0xff) >> 6;
  -         long l2 = 1L << (curChar & 077);
  -         MatchLoop: do
  +         if ((active0 & 0x180000000000L) != 0L)
            {
  -            switch(jjstateSet[--i])
  -            {
  -               case 3:
  -               case 6:
  -                  if ((jjbitVec0[i2] & l2) == 0L)
  -                     break;
  -                  if (kind > 14)
  -                     kind = 14;
  -                  jjCheckNAdd(6);
  -                  break;
  -               case 1:
  -                  if ((jjbitVec0[i2] & l2) != 0L && kind > 10)
  -                     kind = 10;
  -                  break;
  -               case 5:
  -                  if ((jjbitVec0[i2] & l2) != 0L && kind > 13)
  -                     kind = 13;
  -                  break;
  -               default : break;
  -            }
  -         } while(i != startsAt);
  -      }
  -      if (kind != 0x7fffffff)
  -      {
  -         jjmatchedKind = kind;
  -         jjmatchedPos = curPos;
  -         kind = 0x7fffffff;
  -      }
  -      ++curPos;
  -      if ((i = jjnewStateCnt) == (startsAt = 7 - (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)
  -{
  -   switch (pos)
  -   {
  -      case 0:
  +            jjmatchedKind = 50;
  +            return 15;
  +         }
            if ((active0 & 0x1a00L) != 0L)
  -            return 2;
  -         if ((active0 & 0xc00000L) != 0L)
  +            return 5;
  +         if ((active0 & 0x660000c00000L) != 0L)
            {
  -            jjmatchedKind = 54;
  -            return 8;
  +            jjmatchedKind = 50;
  +            return 18;
            }
            return -1;
         case 1:
            if ((active0 & 0x800L) != 0L)
  -            return 0;
  -         if ((active0 & 0xc00000L) != 0L)
  +            return 3;
  +         if ((active0 & 0x40000000000L) != 0L)
  +            return 18;
  +         if ((active0 & 0x7a0000c00000L) != 0L)
            {
  -            jjmatchedKind = 54;
  +            jjmatchedKind = 50;
               jjmatchedPos = 1;
  -            return 8;
  +            return 18;
            }
            return -1;
         case 2:
  -         if ((active0 & 0xc00000L) != 0L)
  +         if ((active0 & 0x5a0000c00000L) != 0L)
            {
  -            jjmatchedKind = 54;
  +            jjmatchedKind = 50;
               jjmatchedPos = 2;
  -            return 8;
  +            return 18;
            }
  +         if ((active0 & 0x200000000000L) != 0L)
  +            return 18;
            return -1;
         case 3:
  -         if ((active0 & 0x400000L) != 0L)
  -            return 8;
  +         if ((active0 & 0x20000800000L) != 0L)
  +         {
  +            if (jjmatchedPos != 3)
  +            {
  +               jjmatchedKind = 50;
  +               jjmatchedPos = 3;
  +            }
  +            return 18;
  +         }
  +         if ((active0 & 0x580000400000L) != 0L)
  +            return 18;
  +         return -1;
  +      case 4:
  +         if ((active0 & 0xa0000000000L) != 0L)
  +         {
  +            jjmatchedKind = 50;
  +            jjmatchedPos = 4;
  +            return 18;
  +         }
            if ((active0 & 0x800000L) != 0L)
  +            return 18;
  +         return -1;
  +      case 5:
  +         if ((active0 & 0x20000000000L) != 0L)
            {
  -            jjmatchedKind = 54;
  -            jjmatchedPos = 3;
  -            return 8;
  +            jjmatchedKind = 50;
  +            jjmatchedPos = 5;
  +            return 18;
            }
  +         if ((active0 & 0x80000000000L) != 0L)
  +            return 18;
            return -1;
         default :
            return -1;
      }
  +}
  +private final int jjStartNfa_0(int pos, long active0)
  +{
  +   return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0), pos + 1);
   }
  -private final int jjStartNfa_2(int pos, long active0)
  +private final int jjStopAtPos(int pos, int kind)
   {
  -   return jjMoveNfa_2(jjStopStringLiteralDfa_2(pos, active0), pos + 1);
  +   jjmatchedKind = kind;
  +   jjmatchedPos = pos;
  +   return pos + 1;
   }
  -private final int jjStartNfaWithStates_2(int pos, int kind, int state)
  +private final int jjStartNfaWithStates_0(int pos, int kind, int state)
   {
      jjmatchedKind = kind;
      jjmatchedPos = pos;
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) { return pos + 1; }
  -   return jjMoveNfa_2(state, pos + 1);
  +   return jjMoveNfa_0(state, pos + 1);
   }
  -private final int jjMoveStringLiteralDfa0_2()
  +private final int jjMoveStringLiteralDfa0_0()
   {
      switch(curChar)
      {
  +      case 33:
  +         jjmatchedKind = 38;
  +         return jjMoveStringLiteralDfa1_0(0x2000000000L);
         case 35:
            jjmatchedKind = 12;
  -         return jjMoveStringLiteralDfa1_2(0xa00L);
  +         return jjMoveStringLiteralDfa1_0(0xa00L);
         case 36:
            jjmatchedKind = 7;
  -         return jjMoveStringLiteralDfa1_2(0x100L);
  -      case 41:
  -         return jjStopAtPos(0, 6);
  +         return jjMoveStringLiteralDfa1_0(0x100L);
  +      case 37:
  +         return jjStopAtPos(0, 29);
  +      case 38:
  +         return jjMoveStringLiteralDfa1_0(0x40000000L);
  +      case 40:
  +         return jjStopAtPos(0, 4);
  +      case 42:
  +         return jjStopAtPos(0, 27);
  +      case 43:
  +         return jjStopAtPos(0, 26);
         case 44:
            return jjStopAtPos(0, 3);
  +      case 45:
  +         return jjStopAtPos(0, 25);
  +      case 47:
  +         return jjStopAtPos(0, 28);
  +      case 60:
  +         jjmatchedKind = 32;
  +         return jjMoveStringLiteralDfa1_0(0x200000000L);
  +      case 61:
  +         jjmatchedKind = 39;
  +         return jjMoveStringLiteralDfa1_0(0x1000000000L);
  +      case 62:
  +         jjmatchedKind = 34;
  +         return jjMoveStringLiteralDfa1_0(0x800000000L);
         case 91:
            return jjStopAtPos(0, 1);
         case 93:
            return jjStopAtPos(0, 2);
  +      case 101:
  +         return jjMoveStringLiteralDfa1_0(0x180000000000L);
         case 102:
  -         return jjMoveStringLiteralDfa1_2(0x800000L);
  +         return jjMoveStringLiteralDfa1_0(0x800000L);
  +      case 105:
  +         return jjMoveStringLiteralDfa1_0(0x60000000000L);
  +      case 115:
  +         return jjMoveStringLiteralDfa1_0(0x600000000000L);
         case 116:
  -         return jjMoveStringLiteralDfa1_2(0x400000L);
  -      case 123:
  -         return jjStopAtPos(0, 56);
  -      case 125:
  -         return jjStopAtPos(0, 57);
  +         return jjMoveStringLiteralDfa1_0(0x400000L);
  +      case 124:
  +         return jjMoveStringLiteralDfa1_0(0x80000000L);
         default :
  -         return jjMoveNfa_2(3, 0);
  +         return jjMoveNfa_0(0, 0);
      }
   }
  -private final int jjMoveStringLiteralDfa1_2(long active0)
  +private final int jjMoveStringLiteralDfa1_0(long active0)
   {
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_2(0, active0);
  +      jjStopStringLiteralDfa_0(0, active0);
         return 1;
      }
      switch(curChar)
  @@ -564,86 +390,216 @@
            if ((active0 & 0x200L) != 0L)
               return jjStopAtPos(1, 9);
            break;
  +      case 38:
  +         if ((active0 & 0x40000000L) != 0L)
  +            return jjStopAtPos(1, 30);
  +         break;
         case 42:
            if ((active0 & 0x800L) != 0L)
  -            return jjStartNfaWithStates_2(1, 11, 0);
  +            return jjStartNfaWithStates_0(1, 11, 3);
  +         break;
  +      case 61:
  +         if ((active0 & 0x200000000L) != 0L)
  +            return jjStopAtPos(1, 33);
  +         else if ((active0 & 0x800000000L) != 0L)
  +            return jjStopAtPos(1, 35);
  +         else if ((active0 & 0x1000000000L) != 0L)
  +            return jjStopAtPos(1, 36);
  +         else if ((active0 & 0x2000000000L) != 0L)
  +            return jjStopAtPos(1, 37);
            break;
         case 97:
  -         return jjMoveStringLiteralDfa2_2(active0, 0x800000L);
  +         return jjMoveStringLiteralDfa2_0(active0, 0x800000L);
  +      case 101:
  +         return jjMoveStringLiteralDfa2_0(active0, 0x200000000000L);
  +      case 102:
  +         if ((active0 & 0x40000000000L) != 0L)
  +            return jjStartNfaWithStates_0(1, 42, 18);
  +         break;
  +      case 108:
  +         return jjMoveStringLiteralDfa2_0(active0, 0x180000000000L);
  +      case 110:
  +         return jjMoveStringLiteralDfa2_0(active0, 0x20000000000L);
         case 114:
  -         return jjMoveStringLiteralDfa2_2(active0, 0x400000L);
  +         return jjMoveStringLiteralDfa2_0(active0, 0x400000L);
  +      case 116:
  +         return jjMoveStringLiteralDfa2_0(active0, 0x400000000000L);
  +      case 124:
  +         if ((active0 & 0x80000000L) != 0L)
  +            return jjStopAtPos(1, 31);
  +         break;
         default :
            break;
      }
  -   return jjStartNfa_2(0, active0);
  +   return jjStartNfa_0(0, active0);
   }
  -private final int jjMoveStringLiteralDfa2_2(long old0, long active0)
  +private final int jjMoveStringLiteralDfa2_0(long old0, long active0)
   {
      if (((active0 &= old0)) == 0L)
  -      return jjStartNfa_2(0, old0); 
  +      return jjStartNfa_0(0, old0); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_2(1, active0);
  +      jjStopStringLiteralDfa_0(1, active0);
         return 2;
      }
      switch(curChar)
      {
  +      case 99:
  +         return jjMoveStringLiteralDfa3_0(active0, 0x20000000000L);
         case 108:
  -         return jjMoveStringLiteralDfa3_2(active0, 0x800000L);
  +         return jjMoveStringLiteralDfa3_0(active0, 0x800000L);
  +      case 111:
  +         return jjMoveStringLiteralDfa3_0(active0, 0x400000000000L);
  +      case 115:
  +         return jjMoveStringLiteralDfa3_0(active0, 0x180000000000L);
  +      case 116:
  +         if ((active0 & 0x200000000000L) != 0L)
  +            return jjStartNfaWithStates_0(2, 45, 18);
  +         break;
         case 117:
  -         return jjMoveStringLiteralDfa3_2(active0, 0x400000L);
  +         return jjMoveStringLiteralDfa3_0(active0, 0x400000L);
         default :
            break;
      }
  -   return jjStartNfa_2(1, active0);
  +   return jjStartNfa_0(1, active0);
   }
  -private final int jjMoveStringLiteralDfa3_2(long old0, long active0)
  +private final int jjMoveStringLiteralDfa3_0(long old0, long active0)
   {
      if (((active0 &= old0)) == 0L)
  -      return jjStartNfa_2(1, old0); 
  +      return jjStartNfa_0(1, old0); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_2(2, active0);
  +      jjStopStringLiteralDfa_0(2, active0);
         return 3;
      }
      switch(curChar)
      {
         case 101:
            if ((active0 & 0x400000L) != 0L)
  -            return jjStartNfaWithStates_2(3, 22, 8);
  +            return jjStartNfaWithStates_0(3, 22, 18);
  +         else if ((active0 & 0x100000000000L) != 0L)
  +         {
  +            jjmatchedKind = 44;
  +            jjmatchedPos = 3;
  +         }
  +         return jjMoveStringLiteralDfa4_0(active0, 0x80000000000L);
  +      case 108:
  +         return jjMoveStringLiteralDfa4_0(active0, 0x20000000000L);
  +      case 112:
  +         if ((active0 & 0x400000000000L) != 0L)
  +            return jjStartNfaWithStates_0(3, 46, 18);
            break;
         case 115:
  -         return jjMoveStringLiteralDfa4_2(active0, 0x800000L);
  +         return jjMoveStringLiteralDfa4_0(active0, 0x800000L);
         default :
            break;
      }
  -   return jjStartNfa_2(2, active0);
  +   return jjStartNfa_0(2, active0);
   }
  -private final int jjMoveStringLiteralDfa4_2(long old0, long active0)
  +private final int jjMoveStringLiteralDfa4_0(long old0, long active0)
   {
      if (((active0 &= old0)) == 0L)
  -      return jjStartNfa_2(2, old0); 
  +      return jjStartNfa_0(2, old0); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_2(3, active0);
  +      jjStopStringLiteralDfa_0(3, active0);
         return 4;
      }
      switch(curChar)
      {
         case 101:
            if ((active0 & 0x800000L) != 0L)
  -            return jjStartNfaWithStates_2(4, 23, 8);
  +            return jjStartNfaWithStates_0(4, 23, 18);
  +         break;
  +      case 105:
  +         return jjMoveStringLiteralDfa5_0(active0, 0x80000000000L);
  +      case 117:
  +         return jjMoveStringLiteralDfa5_0(active0, 0x20000000000L);
  +      default :
  +         break;
  +   }
  +   return jjStartNfa_0(3, active0);
  +}
  +private final int jjMoveStringLiteralDfa5_0(long old0, long active0)
  +{
  +   if (((active0 &= old0)) == 0L)
  +      return jjStartNfa_0(3, old0); 
  +   try { curChar = input_stream.readChar(); }
  +   catch(java.io.IOException e) {
  +      jjStopStringLiteralDfa_0(4, active0);
  +      return 5;
  +   }
  +   switch(curChar)
  +   {
  +      case 100:
  +         return jjMoveStringLiteralDfa6_0(active0, 0x20000000000L);
  +      case 102:
  +         if ((active0 & 0x80000000000L) != 0L)
  +            return jjStartNfaWithStates_0(5, 43, 18);
            break;
         default :
            break;
      }
  -   return jjStartNfa_2(3, active0);
  +   return jjStartNfa_0(4, active0);
   }
  -private final int jjMoveNfa_2(int startState, int curPos)
  +private final int jjMoveStringLiteralDfa6_0(long old0, long active0)
  +{
  +   if (((active0 &= old0)) == 0L)
  +      return jjStartNfa_0(4, old0); 
  +   try { curChar = input_stream.readChar(); }
  +   catch(java.io.IOException e) {
  +      jjStopStringLiteralDfa_0(5, active0);
  +      return 6;
  +   }
  +   switch(curChar)
  +   {
  +      case 101:
  +         if ((active0 & 0x20000000000L) != 0L)
  +            return jjStartNfaWithStates_0(6, 41, 18);
  +         break;
  +      default :
  +         break;
  +   }
  +   return jjStartNfa_0(5, active0);
  +}
  +private final void jjCheckNAdd(int state)
  +{
  +   if (jjrounds[state] != jjround)
  +   {
  +      jjstateSet[jjnewStateCnt++] = state;
  +      jjrounds[state] = jjround;
  +   }
  +}
  +private final void jjAddStates(int start, int end)
  +{
  +   do {
  +      jjstateSet[jjnewStateCnt++] = jjnextStates[start];
  +   } while (start++ != end);
  +}
  +private final void jjCheckNAddTwoStates(int state1, int state2)
  +{
  +   jjCheckNAdd(state1);
  +   jjCheckNAdd(state2);
  +}
  +private final void jjCheckNAddStates(int start, int end)
  +{
  +   do {
  +      jjCheckNAdd(jjnextStates[start]);
  +   } while (start++ != end);
  +}
  +private final void jjCheckNAddStates(int start)
  +{
  +   jjCheckNAdd(jjnextStates[start]);
  +   jjCheckNAdd(jjnextStates[start + 1]);
  +}
  +static final long[] jjbitVec0 = {
  +   0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL
  +};
  +private final int jjMoveNfa_0(int startState, int curPos)
   {
      int[] nextStates;
      int startsAt = 0;
  -   jjnewStateCnt = 11;
  +   jjnewStateCnt = 19;
      int i = 1;
      jjstateSet[0] = startState;
      int j, kind = 0x7fffffff;
  @@ -658,48 +614,92 @@
            {
               switch(jjstateSet[--i])
               {
  -               case 3:
  -                  if (curChar == 46)
  -                     jjstateSet[jjnewStateCnt++] = 10;
  +               case 0:
  +                  if ((0x3ff000000000000L & l) != 0L)
  +                  {
  +                     if (kind > 48)
  +                        kind = 48;
  +                     jjCheckNAdd(17);
  +                  }
  +                  else if ((0x2400L & l) != 0L)
  +                  {
  +                     if (kind > 24)
  +                        kind = 24;
  +                  }
                     else if (curChar == 34)
  -                     jjCheckNAddTwoStates(5, 6);
  +                     jjCheckNAddTwoStates(8, 9);
                     else if (curChar == 35)
  -                     jjstateSet[jjnewStateCnt++] = 2;
  +                     jjstateSet[jjnewStateCnt++] = 5;
  +                  else if (curChar == 41)
  +                  {
  +                     if (kind > 5)
  +                        kind = 5;
  +                     jjCheckNAddTwoStates(1, 2);
  +                  }
  +                  if (curChar == 13)
  +                     jjstateSet[jjnewStateCnt++] = 11;
                     break;
  -               case 0:
  +               case 1:
  +                  if (curChar != 32)
  +                     break;
  +                  if (kind > 5)
  +                     kind = 5;
  +                  jjCheckNAddTwoStates(1, 2);
  +                  break;
  +               case 2:
  +                  if (curChar == 10 && kind > 5)
  +                     kind = 5;
  +                  break;
  +               case 3:
                     if (curChar == 42)
  -                     jjstateSet[jjnewStateCnt++] = 1;
  +                     jjstateSet[jjnewStateCnt++] = 4;
                     break;
  -               case 1:
  +               case 4:
                     if ((0xfffffff7ffffffffL & l) != 0L && kind > 10)
                        kind = 10;
                     break;
  -               case 2:
  +               case 5:
                     if (curChar == 42)
  -                     jjstateSet[jjnewStateCnt++] = 0;
  +                     jjstateSet[jjnewStateCnt++] = 3;
                     break;
  -               case 4:
  +               case 6:
  +                  if (curChar == 35)
  +                     jjstateSet[jjnewStateCnt++] = 5;
  +                  break;
  +               case 7:
                     if (curChar == 34)
  -                     jjCheckNAddTwoStates(5, 6);
  +                     jjCheckNAddTwoStates(8, 9);
                     break;
  -               case 5:
  +               case 8:
                     if ((0xfffffffbffffdbffL & l) != 0L)
  -                     jjCheckNAddTwoStates(5, 6);
  +                     jjCheckNAddTwoStates(8, 9);
                     break;
  -               case 6:
  +               case 9:
                     if (curChar == 34 && kind > 21)
                        kind = 21;
                     break;
  -               case 8:
  -                  if ((0x3ff200000000000L & l) == 0L)
  -                     break;
  -                  if (kind > 54)
  -                     kind = 54;
  -                  jjstateSet[jjnewStateCnt++] = 8;
  +               case 10:
  +                  if ((0x2400L & l) != 0L && kind > 24)
  +                     kind = 24;
                     break;
  -               case 9:
  -                  if (curChar == 46)
  -                     jjstateSet[jjnewStateCnt++] = 10;
  +               case 11:
  +                  if (curChar == 10 && kind > 24)
  +                     kind = 24;
  +                  break;
  +               case 12:
  +                  if (curChar == 13)
  +                     jjstateSet[jjnewStateCnt++] = 11;
  +                  break;
  +               case 14:
  +                  if (curChar == 10 && kind > 40)
  +                     kind = 40;
  +                  break;
  +               case 17:
  +                  if ((0x3ff000000000000L & l) == 0L)
  +                     break;
  +                  if (kind > 48)
  +                     kind = 48;
  +                  jjCheckNAdd(17);
                     break;
                  default : break;
               }
  @@ -712,30 +712,50 @@
            {
               switch(jjstateSet[--i])
               {
  -               case 3:
  -                  if ((0x7fffffe07fffffeL & l) == 0L)
  -                     break;
  -                  if (kind > 54)
  -                     kind = 54;
  -                  jjCheckNAdd(8);
  +               case 15:
  +                  if ((0x7fffffe07fffffeL & l) != 0L)
  +                  {
  +                     if (kind > 50)
  +                        kind = 50;
  +                     jjCheckNAdd(18);
  +                  }
  +                  if (curChar == 110)
  +                     jjstateSet[jjnewStateCnt++] = 13;
                     break;
  -               case 1:
  +               case 0:
  +                  if ((0x7fffffe07fffffeL & l) != 0L)
  +                  {
  +                     if (kind > 50)
  +                        kind = 50;
  +                     jjCheckNAdd(18);
  +                  }
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 15;
  +                  break;
  +               case 4:
                     if (kind > 10)
                        kind = 10;
                     break;
  -               case 5:
  +               case 8:
                     jjAddStates(0, 1);
                     break;
  -               case 8:
  -                  if ((0x7fffffe87fffffeL & l) == 0L)
  +               case 13:
  +                  if (curChar != 100)
                        break;
  -                  if (kind > 54)
  -                     kind = 54;
  -                  jjCheckNAdd(8);
  +                  if (kind > 40)
  +                     kind = 40;
  +                  jjstateSet[jjnewStateCnt++] = 14;
                     break;
  -               case 10:
  -                  if ((0x7fffffe07fffffeL & l) != 0L && kind > 55)
  -                     kind = 55;
  +               case 16:
  +                  if (curChar == 101)
  +                     jjstateSet[jjnewStateCnt++] = 15;
  +                  break;
  +               case 18:
  +                  if ((0x7fffffe07fffffeL & l) == 0L)
  +                     break;
  +                  if (kind > 50)
  +                     kind = 50;
  +                  jjCheckNAdd(18);
                     break;
                  default : break;
               }
  @@ -749,11 +769,11 @@
            {
               switch(jjstateSet[--i])
               {
  -               case 1:
  +               case 4:
                     if ((jjbitVec0[i2] & l2) != 0L && kind > 10)
                        kind = 10;
                     break;
  -               case 5:
  +               case 8:
                     if ((jjbitVec0[i2] & l2) != 0L)
                        jjAddStates(0, 1);
                     break;
  @@ -768,7 +788,7 @@
            kind = 0x7fffffff;
         }
         ++curPos;
  -      if ((i = jjnewStateCnt) == (startsAt = 11 - (jjnewStateCnt = startsAt)))
  +      if ((i = jjnewStateCnt) == (startsAt = 19 - (jjnewStateCnt = startsAt)))
            return curPos;
         try { curChar = input_stream.readChar(); }
         catch(java.io.IOException e) { return curPos; }
  @@ -924,75 +944,182 @@
         catch(java.io.IOException e) { return curPos; }
      }
   }
  -private final int jjStopStringLiteralDfa_6(int pos, long active0)
  +private final int jjStopStringLiteralDfa_3(int pos, long active0)
   {
      switch (pos)
      {
         case 0:
  +         if ((active0 & 0xc00000L) != 0L)
  +         {
  +            jjmatchedKind = 54;
  +            return 8;
  +         }
            if ((active0 & 0x1a00L) != 0L)
               return 2;
            return -1;
  +      case 1:
  +         if ((active0 & 0x800L) != 0L)
  +            return 0;
  +         if ((active0 & 0xc00000L) != 0L)
  +         {
  +            jjmatchedKind = 54;
  +            jjmatchedPos = 1;
  +            return 8;
  +         }
  +         return -1;
  +      case 2:
  +         if ((active0 & 0xc00000L) != 0L)
  +         {
  +            jjmatchedKind = 54;
  +            jjmatchedPos = 2;
  +            return 8;
  +         }
  +         return -1;
  +      case 3:
  +         if ((active0 & 0x800000L) != 0L)
  +         {
  +            jjmatchedKind = 54;
  +            jjmatchedPos = 3;
  +            return 8;
  +         }
  +         if ((active0 & 0x400000L) != 0L)
  +            return 8;
  +         return -1;
         default :
            return -1;
      }
   }
  -private final int jjStartNfa_6(int pos, long active0)
  +private final int jjStartNfa_3(int pos, long active0)
   {
  -   return jjMoveNfa_6(jjStopStringLiteralDfa_6(pos, active0), pos + 1);
  +   return jjMoveNfa_3(jjStopStringLiteralDfa_3(pos, active0), pos + 1);
   }
  -private final int jjStartNfaWithStates_6(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_6(state, pos + 1);
  +   return jjMoveNfa_3(state, pos + 1);
   }
  -private final int jjMoveStringLiteralDfa0_6()
  +private final int jjMoveStringLiteralDfa0_3()
   {
      switch(curChar)
      {
         case 35:
            jjmatchedKind = 12;
  -         return jjMoveStringLiteralDfa1_6(0xa00L);
  +         return jjMoveStringLiteralDfa1_3(0xa00L);
         case 36:
            jjmatchedKind = 7;
  -         return jjMoveStringLiteralDfa1_6(0x100L);
  +         return jjMoveStringLiteralDfa1_3(0x100L);
  +      case 102:
  +         return jjMoveStringLiteralDfa1_3(0x800000L);
  +      case 116:
  +         return jjMoveStringLiteralDfa1_3(0x400000L);
  +      case 123:
  +         return jjStopAtPos(0, 56);
  +      case 125:
  +         return jjStopAtPos(0, 57);
  +      default :
  +         return jjMoveNfa_3(3, 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 & 0x100L) != 0L)
  +            return jjStopAtPos(1, 8);
  +         break;
  +      case 35:
  +         if ((active0 & 0x200L) != 0L)
  +            return jjStopAtPos(1, 9);
  +         break;
  +      case 42:
  +         if ((active0 & 0x800L) != 0L)
  +            return jjStartNfaWithStates_3(1, 11, 0);
  +         break;
  +      case 97:
  +         return jjMoveStringLiteralDfa2_3(active0, 0x800000L);
  +      case 114:
  +         return jjMoveStringLiteralDfa2_3(active0, 0x400000L);
  +      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 108:
  +         return jjMoveStringLiteralDfa3_3(active0, 0x800000L);
  +      case 117:
  +         return jjMoveStringLiteralDfa3_3(active0, 0x400000L);
  +      default :
  +         break;
  +   }
  +   return jjStartNfa_3(1, active0);
  +}
  +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 101:
  +         if ((active0 & 0x400000L) != 0L)
  +            return jjStartNfaWithStates_3(3, 22, 8);
  +         break;
  +      case 115:
  +         return jjMoveStringLiteralDfa4_3(active0, 0x800000L);
         default :
  -         return jjMoveNfa_6(3, 0);
  +         break;
      }
  +   return jjStartNfa_3(2, active0);
   }
  -private final int jjMoveStringLiteralDfa1_6(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_6(0, active0);
  -      return 1;
  +      jjStopStringLiteralDfa_3(3, active0);
  +      return 4;
      }
      switch(curChar)
      {
  -      case 33:
  -         if ((active0 & 0x100L) != 0L)
  -            return jjStopAtPos(1, 8);
  -         break;
  -      case 35:
  -         if ((active0 & 0x200L) != 0L)
  -            return jjStopAtPos(1, 9);
  -         break;
  -      case 42:
  -         if ((active0 & 0x800L) != 0L)
  -            return jjStartNfaWithStates_6(1, 11, 0);
  +      case 101:
  +         if ((active0 & 0x800000L) != 0L)
  +            return jjStartNfaWithStates_3(4, 23, 8);
            break;
         default :
            break;
      }
  -   return jjStartNfa_6(0, active0);
  +   return jjStartNfa_3(3, active0);
   }
  -private final int jjMoveNfa_6(int startState, int curPos)
  +private final int jjMoveNfa_3(int startState, int curPos)
   {
      int[] nextStates;
      int startsAt = 0;
  -   jjnewStateCnt = 7;
  +   jjnewStateCnt = 11;
      int i = 1;
      jjstateSet[0] = startState;
      int j, kind = 0x7fffffff;
  @@ -1008,15 +1135,12 @@
               switch(jjstateSet[--i])
               {
                  case 3:
  -                  if ((0x2400L & l) != 0L)
  -                  {
  -                     if (kind > 15)
  -                        kind = 15;
  -                  }
  +                  if (curChar == 46)
  +                     jjstateSet[jjnewStateCnt++] = 10;
  +                  else if (curChar == 34)
  +                     jjCheckNAddTwoStates(5, 6);
                     else if (curChar == 35)
                        jjstateSet[jjnewStateCnt++] = 2;
  -                  if (curChar == 13)
  -                     jjstateSet[jjnewStateCnt++] = 5;
                     break;
                  case 0:
                     if (curChar == 42)
  @@ -1031,16 +1155,27 @@
                        jjstateSet[jjnewStateCnt++] = 0;
                     break;
                  case 4:
  -                  if ((0x2400L & l) != 0L && kind > 15)
  -                     kind = 15;
  +                  if (curChar == 34)
  +                     jjCheckNAddTwoStates(5, 6);
                     break;
                  case 5:
  -                  if (curChar == 10 && kind > 15)
  -                     kind = 15;
  +                  if ((0xfffffffbffffdbffL & l) != 0L)
  +                     jjCheckNAddTwoStates(5, 6);
                     break;
                  case 6:
  -                  if (curChar == 13)
  -                     jjstateSet[jjnewStateCnt++] = 5;
  +                  if (curChar == 34 && kind > 21)
  +                     kind = 21;
  +                  break;
  +               case 8:
  +                  if ((0x3ff200000000000L & l) == 0L)
  +                     break;
  +                  if (kind > 54)
  +                     kind = 54;
  +                  jjstateSet[jjnewStateCnt++] = 8;
  +                  break;
  +               case 9:
  +                  if (curChar == 46)
  +                     jjstateSet[jjnewStateCnt++] = 10;
                     break;
                  default : break;
               }
  @@ -1053,8 +1188,30 @@
            {
               switch(jjstateSet[--i])
               {
  +               case 3:
  +                  if ((0x7fffffe07fffffeL & l) == 0L)
  +                     break;
  +                  if (kind > 54)
  +                     kind = 54;
  +                  jjCheckNAdd(8);
  +                  break;
                  case 1:
  -                  kind = 10;
  +                  if (kind > 10)
  +                     kind = 10;
  +                  break;
  +               case 5:
  +                  jjAddStates(2, 3);
  +                  break;
  +               case 8:
  +                  if ((0x7fffffe87fffffeL & l) == 0L)
  +                     break;
  +                  if (kind > 54)
  +                     kind = 54;
  +                  jjCheckNAdd(8);
  +                  break;
  +               case 10:
  +                  if ((0x7fffffe07fffffeL & l) != 0L && kind > 55)
  +                     kind = 55;
                     break;
                  default : break;
               }
  @@ -1072,6 +1229,10 @@
                     if ((jjbitVec0[i2] & l2) != 0L && kind > 10)
                        kind = 10;
                     break;
  +               case 5:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(2, 3);
  +                  break;
                  default : break;
               }
            } while(i != startsAt);
  @@ -1083,7 +1244,7 @@
            kind = 0x7fffffff;
         }
         ++curPos;
  -      if ((i = jjnewStateCnt) == (startsAt = 7 - (jjnewStateCnt = startsAt)))
  +      if ((i = jjnewStateCnt) == (startsAt = 11 - (jjnewStateCnt = startsAt)))
            return curPos;
         try { curChar = input_stream.readChar(); }
         catch(java.io.IOException e) { return curPos; }
  @@ -1094,13 +1255,13 @@
      switch (pos)
      {
         case 0:
  +         if ((active0 & 0x1a00L) != 0L)
  +            return 5;
            if ((active0 & 0xc00000L) != 0L)
            {
               jjmatchedKind = 54;
               return 11;
            }
  -         if ((active0 & 0x1a00L) != 0L)
  -            return 5;
            return -1;
         case 1:
            if ((active0 & 0xc00000L) != 0L)
  @@ -1372,7 +1533,7 @@
                        kind = 10;
                     break;
                  case 8:
  -                  jjAddStates(2, 3);
  +                  jjAddStates(0, 1);
                     break;
                  case 11:
                     if ((0x7fffffe87fffffeL & l) == 0L)
  @@ -1396,15 +1557,165 @@
            MatchLoop: do
            {
               switch(jjstateSet[--i])
  +            {
  +               case 4:
  +                  if ((jjbitVec0[i2] & l2) != 0L && kind > 10)
  +                     kind = 10;
  +                  break;
  +               case 8:
  +                  if ((jjbitVec0[i2] & l2) != 0L)
  +                     jjAddStates(0, 1);
  +                  break;
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      if (kind != 0x7fffffff)
  +      {
  +         jjmatchedKind = kind;
  +         jjmatchedPos = curPos;
  +         kind = 0x7fffffff;
  +      }
  +      ++curPos;
  +      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_5(int pos, long active0)
  +{
  +   switch (pos)
  +   {
  +      case 0:
  +         if ((active0 & 0x1a00L) != 0L)
  +            return 2;
  +         return -1;
  +      default :
  +         return -1;
  +   }
  +}
  +private final int jjStartNfa_5(int pos, long active0)
  +{
  +   return jjMoveNfa_5(jjStopStringLiteralDfa_5(pos, active0), pos + 1);
  +}
  +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_5(state, pos + 1);
  +}
  +private final int jjMoveStringLiteralDfa0_5()
  +{
  +   switch(curChar)
  +   {
  +      case 35:
  +         jjmatchedKind = 12;
  +         return jjMoveStringLiteralDfa1_5(0xa00L);
  +      case 36:
  +         jjmatchedKind = 7;
  +         return jjMoveStringLiteralDfa1_5(0x100L);
  +      case 42:
  +         return jjMoveStringLiteralDfa1_5(0x10000L);
  +      default :
  +         return jjMoveNfa_5(3, 0);
  +   }
  +}
  +private final int jjMoveStringLiteralDfa1_5(long active0)
  +{
  +   try { curChar = input_stream.readChar(); }
  +   catch(java.io.IOException e) {
  +      jjStopStringLiteralDfa_5(0, active0);
  +      return 1;
  +   }
  +   switch(curChar)
  +   {
  +      case 33:
  +         if ((active0 & 0x100L) != 0L)
  +            return jjStopAtPos(1, 8);
  +         break;
  +      case 35:
  +         if ((active0 & 0x200L) != 0L)
  +            return jjStopAtPos(1, 9);
  +         else if ((active0 & 0x10000L) != 0L)
  +            return jjStopAtPos(1, 16);
  +         break;
  +      case 42:
  +         if ((active0 & 0x800L) != 0L)
  +            return jjStartNfaWithStates_5(1, 11, 0);
  +         break;
  +      default :
  +         break;
  +   }
  +   return jjStartNfa_5(0, active0);
  +}
  +private final int jjMoveNfa_5(int startState, int curPos)
  +{
  +   int[] nextStates;
  +   int startsAt = 0;
  +   jjnewStateCnt = 4;
  +   int i = 1;
  +   jjstateSet[0] = startState;
  +   int j, kind = 0x7fffffff;
  +   for (;;)
  +   {
  +      if (++jjround == 0x7fffffff)
  +         ReInitRounds();
  +      if (curChar < 64)
  +      {
  +         long l = 1L << curChar;
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 0:
  +                  if (curChar == 42)
  +                     jjstateSet[jjnewStateCnt++] = 1;
  +                  break;
  +               case 1:
  +                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 10)
  +                     kind = 10;
  +                  break;
  +               case 2:
  +                  if (curChar == 42)
  +                     jjstateSet[jjnewStateCnt++] = 0;
  +                  break;
  +               case 3:
  +                  if (curChar == 35)
  +                     jjstateSet[jjnewStateCnt++] = 2;
  +                  break;
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      else if (curChar < 128)
  +      {
  +         long l = 1L << (curChar & 077);
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
  +            {
  +               case 1:
  +                  kind = 10;
  +                  break;
  +               default : break;
  +            }
  +         } while(i != startsAt);
  +      }
  +      else
  +      {
  +         int i2 = (curChar & 0xff) >> 6;
  +         long l2 = 1L << (curChar & 077);
  +         MatchLoop: do
  +         {
  +            switch(jjstateSet[--i])
               {
  -               case 4:
  +               case 1:
                     if ((jjbitVec0[i2] & l2) != 0L && kind > 10)
                        kind = 10;
                     break;
  -               case 8:
  -                  if ((jjbitVec0[i2] & l2) != 0L)
  -                     jjAddStates(2, 3);
  -                  break;
                  default : break;
               }
            } while(i != startsAt);
  @@ -1416,353 +1727,196 @@
            kind = 0x7fffffff;
         }
         ++curPos;
  -      if ((i = jjnewStateCnt) == (startsAt = 14 - (jjnewStateCnt = startsAt)))
  +      if ((i = jjnewStateCnt) == (startsAt = 4 - (jjnewStateCnt = startsAt)))
            return curPos;
         try { curChar = input_stream.readChar(); }
         catch(java.io.IOException e) { return curPos; }
      }
   }
  -private final int jjStopStringLiteralDfa_0(int pos, long active0)
  +private final int jjStopStringLiteralDfa_2(int pos, long active0)
   {
      switch (pos)
      {
         case 0:
  -         if ((active0 & 0x180000000000L) != 0L)
  -         {
  -            jjmatchedKind = 50;
  -            return 15;
  -         }
  -         if ((active0 & 0x660000c00000L) != 0L)
  +         if ((active0 & 0xc00000L) != 0L)
            {
  -            jjmatchedKind = 50;
  -            return 18;
  +            jjmatchedKind = 54;
  +            return 8;
            }
            if ((active0 & 0x1a00L) != 0L)
  -            return 5;
  +            return 2;
            return -1;
         case 1:
  -         if ((active0 & 0x40000000000L) != 0L)
  -            return 18;
  -         if ((active0 & 0x7a0000c00000L) != 0L)
  +         if ((active0 & 0x800L) != 0L)
  +            return 0;
  +         if ((active0 & 0xc00000L) != 0L)
            {
  -            jjmatchedKind = 50;
  +            jjmatchedKind = 54;
               jjmatchedPos = 1;
  -            return 18;
  +            return 8;
            }
  -         if ((active0 & 0x800L) != 0L)
  -            return 3;
            return -1;
         case 2:
  -         if ((active0 & 0x200000000000L) != 0L)
  -            return 18;
  -         if ((active0 & 0x5a0000c00000L) != 0L)
  +         if ((active0 & 0xc00000L) != 0L)
            {
  -            jjmatchedKind = 50;
  +            jjmatchedKind = 54;
               jjmatchedPos = 2;
  -            return 18;
  +            return 8;
            }
            return -1;
         case 3:
  -         if ((active0 & 0x580000400000L) != 0L)
  -            return 18;
  -         if ((active0 & 0x20000800000L) != 0L)
  -         {
  -            if (jjmatchedPos != 3)
  -            {
  -               jjmatchedKind = 50;
  -               jjmatchedPos = 3;
  -            }
  -            return 18;
  -         }
  -         return -1;
  -      case 4:
  -         if ((active0 & 0xa0000000000L) != 0L)
  -         {
  -            jjmatchedKind = 50;
  -            jjmatchedPos = 4;
  -            return 18;
  -         }
            if ((active0 & 0x800000L) != 0L)
  -            return 18;
  -         return -1;
  -      case 5:
  -         if ((active0 & 0x80000000000L) != 0L)
  -            return 18;
  -         if ((active0 & 0x20000000000L) != 0L)
            {
  -            jjmatchedKind = 50;
  -            jjmatchedPos = 5;
  -            return 18;
  +            jjmatchedKind = 54;
  +            jjmatchedPos = 3;
  +            return 8;
            }
  +         if ((active0 & 0x400000L) != 0L)
  +            return 8;
            return -1;
         default :
            return -1;
      }
   }
  -private final int jjStartNfa_0(int pos, long active0)
  +private final int jjStartNfa_2(int pos, long active0)
   {
  -   return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0), pos + 1);
  +   return jjMoveNfa_2(jjStopStringLiteralDfa_2(pos, active0), pos + 1);
   }
  -private final int jjStartNfaWithStates_0(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_0(state, pos + 1);
  +   return jjMoveNfa_2(state, pos + 1);
   }
  -private final int jjMoveStringLiteralDfa0_0()
  +private final int jjMoveStringLiteralDfa0_2()
   {
      switch(curChar)
      {
  -      case 33:
  -         jjmatchedKind = 38;
  -         return jjMoveStringLiteralDfa1_0(0x2000000000L);
         case 35:
            jjmatchedKind = 12;
  -         return jjMoveStringLiteralDfa1_0(0xa00L);
  +         return jjMoveStringLiteralDfa1_2(0xa00L);
         case 36:
            jjmatchedKind = 7;
  -         return jjMoveStringLiteralDfa1_0(0x100L);
  -      case 37:
  -         return jjStopAtPos(0, 29);
  -      case 38:
  -         return jjMoveStringLiteralDfa1_0(0x40000000L);
  -      case 40:
  -         return jjStopAtPos(0, 4);
  -      case 42:
  -         return jjStopAtPos(0, 27);
  -      case 43:
  -         return jjStopAtPos(0, 26);
  +         return jjMoveStringLiteralDfa1_2(0x100L);
  +      case 41:
  +         return jjStopAtPos(0, 6);
         case 44:
            return jjStopAtPos(0, 3);
  -      case 45:
  -         return jjStopAtPos(0, 25);
  -      case 47:
  -         return jjStopAtPos(0, 28);
  -      case 60:
  -         jjmatchedKind = 32;
  -         return jjMoveStringLiteralDfa1_0(0x200000000L);
  -      case 61:
  -         jjmatchedKind = 39;
  -         return jjMoveStringLiteralDfa1_0(0x1000000000L);
  -      case 62:
  -         jjmatchedKind = 34;
  -         return jjMoveStringLiteralDfa1_0(0x800000000L);
         case 91:
            return jjStopAtPos(0, 1);
         case 93:
            return jjStopAtPos(0, 2);
  -      case 101:
  -         return jjMoveStringLiteralDfa1_0(0x180000000000L);
  -      case 102:
  -         return jjMoveStringLiteralDfa1_0(0x800000L);
  -      case 105:
  -         return jjMoveStringLiteralDfa1_0(0x60000000000L);
  -      case 115:
  -         return jjMoveStringLiteralDfa1_0(0x600000000000L);
  -      case 116:
  -         return jjMoveStringLiteralDfa1_0(0x400000L);
  -      case 124:
  -         return jjMoveStringLiteralDfa1_0(0x80000000L);
  -      default :
  -         return jjMoveNfa_0(0, 0);
  -   }
  -}
  -private final int jjMoveStringLiteralDfa1_0(long active0)
  -{
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_0(0, active0);
  -      return 1;
  -   }
  -   switch(curChar)
  -   {
  -      case 33:
  -         if ((active0 & 0x100L) != 0L)
  -            return jjStopAtPos(1, 8);
  -         break;
  -      case 35:
  -         if ((active0 & 0x200L) != 0L)
  -            return jjStopAtPos(1, 9);
  -         break;
  -      case 38:
  -         if ((active0 & 0x40000000L) != 0L)
  -            return jjStopAtPos(1, 30);
  -         break;
  -      case 42:
  -         if ((active0 & 0x800L) != 0L)
  -            return jjStartNfaWithStates_0(1, 11, 3);
  -         break;
  -      case 61:
  -         if ((active0 & 0x200000000L) != 0L)
  -            return jjStopAtPos(1, 33);
  -         else if ((active0 & 0x800000000L) != 0L)
  -            return jjStopAtPos(1, 35);
  -         else if ((active0 & 0x1000000000L) != 0L)
  -            return jjStopAtPos(1, 36);
  -         else if ((active0 & 0x2000000000L) != 0L)
  -            return jjStopAtPos(1, 37);
  -         break;
  -      case 97:
  -         return jjMoveStringLiteralDfa2_0(active0, 0x800000L);
  -      case 101:
  -         return jjMoveStringLiteralDfa2_0(active0, 0x200000000000L);
         case 102:
  -         if ((active0 & 0x40000000000L) != 0L)
  -            return jjStartNfaWithStates_0(1, 42, 18);
  -         break;
  -      case 108:
  -         return jjMoveStringLiteralDfa2_0(active0, 0x180000000000L);
  -      case 110:
  -         return jjMoveStringLiteralDfa2_0(active0, 0x20000000000L);
  -      case 114:
  -         return jjMoveStringLiteralDfa2_0(active0, 0x400000L);
  -      case 116:
  -         return jjMoveStringLiteralDfa2_0(active0, 0x400000000000L);
  -      case 124:
  -         if ((active0 & 0x80000000L) != 0L)
  -            return jjStopAtPos(1, 31);
  -         break;
  -      default :
  -         break;
  -   }
  -   return jjStartNfa_0(0, active0);
  -}
  -private final int jjMoveStringLiteralDfa2_0(long old0, long active0)
  -{
  -   if (((active0 &= old0)) == 0L)
  -      return jjStartNfa_0(0, old0); 
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_0(1, active0);
  -      return 2;
  -   }
  -   switch(curChar)
  -   {
  -      case 99:
  -         return jjMoveStringLiteralDfa3_0(active0, 0x20000000000L);
  -      case 108:
  -         return jjMoveStringLiteralDfa3_0(active0, 0x800000L);
  -      case 111:
  -         return jjMoveStringLiteralDfa3_0(active0, 0x400000000000L);
  -      case 115:
  -         return jjMoveStringLiteralDfa3_0(active0, 0x180000000000L);
  +         return jjMoveStringLiteralDfa1_2(0x800000L);
         case 116:
  -         if ((active0 & 0x200000000000L) != 0L)
  -            return jjStartNfaWithStates_0(2, 45, 18);
  -         break;
  -      case 117:
  -         return jjMoveStringLiteralDfa3_0(active0, 0x400000L);
  +         return jjMoveStringLiteralDfa1_2(0x400000L);
  +      case 123:
  +         return jjStopAtPos(0, 56);
  +      case 125:
  +         return jjStopAtPos(0, 57);
         default :
  -         break;
  +         return jjMoveNfa_2(3, 0);
      }
  -   return jjStartNfa_0(1, active0);
   }
  -private final int jjMoveStringLiteralDfa3_0(long old0, long active0)
  +private final int jjMoveStringLiteralDfa1_2(long active0)
   {
  -   if (((active0 &= old0)) == 0L)
  -      return jjStartNfa_0(1, old0); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_0(2, active0);
  -      return 3;
  -   }
  -   switch(curChar)
  -   {
  -      case 101:
  -         if ((active0 & 0x400000L) != 0L)
  -            return jjStartNfaWithStates_0(3, 22, 18);
  -         else if ((active0 & 0x100000000000L) != 0L)
  -         {
  -            jjmatchedKind = 44;
  -            jjmatchedPos = 3;
  -         }
  -         return jjMoveStringLiteralDfa4_0(active0, 0x80000000000L);
  -      case 108:
  -         return jjMoveStringLiteralDfa4_0(active0, 0x20000000000L);
  -      case 112:
  -         if ((active0 & 0x400000000000L) != 0L)
  -            return jjStartNfaWithStates_0(3, 46, 18);
  +      jjStopStringLiteralDfa_2(0, active0);
  +      return 1;
  +   }
  +   switch(curChar)
  +   {
  +      case 33:
  +         if ((active0 & 0x100L) != 0L)
  +            return jjStopAtPos(1, 8);
            break;
  -      case 115:
  -         return jjMoveStringLiteralDfa4_0(active0, 0x800000L);
  +      case 35:
  +         if ((active0 & 0x200L) != 0L)
  +            return jjStopAtPos(1, 9);
  +         break;
  +      case 42:
  +         if ((active0 & 0x800L) != 0L)
  +            return jjStartNfaWithStates_2(1, 11, 0);
  +         break;
  +      case 97:
  +         return jjMoveStringLiteralDfa2_2(active0, 0x800000L);
  +      case 114:
  +         return jjMoveStringLiteralDfa2_2(active0, 0x400000L);
         default :
            break;
      }
  -   return jjStartNfa_0(2, active0);
  +   return jjStartNfa_2(0, active0);
   }
  -private final int jjMoveStringLiteralDfa4_0(long old0, long active0)
  +private final int jjMoveStringLiteralDfa2_2(long old0, long active0)
   {
      if (((active0 &= old0)) == 0L)
  -      return jjStartNfa_0(2, old0); 
  +      return jjStartNfa_2(0, old0); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_0(3, active0);
  -      return 4;
  +      jjStopStringLiteralDfa_2(1, active0);
  +      return 2;
      }
      switch(curChar)
      {
  -      case 101:
  -         if ((active0 & 0x800000L) != 0L)
  -            return jjStartNfaWithStates_0(4, 23, 18);
  -         break;
  -      case 105:
  -         return jjMoveStringLiteralDfa5_0(active0, 0x80000000000L);
  +      case 108:
  +         return jjMoveStringLiteralDfa3_2(active0, 0x800000L);
         case 117:
  -         return jjMoveStringLiteralDfa5_0(active0, 0x20000000000L);
  +         return jjMoveStringLiteralDfa3_2(active0, 0x400000L);
         default :
            break;
      }
  -   return jjStartNfa_0(3, active0);
  +   return jjStartNfa_2(1, active0);
   }
  -private final int jjMoveStringLiteralDfa5_0(long old0, long active0)
  +private final int jjMoveStringLiteralDfa3_2(long old0, long active0)
   {
      if (((active0 &= old0)) == 0L)
  -      return jjStartNfa_0(3, old0); 
  +      return jjStartNfa_2(1, old0); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_0(4, active0);
  -      return 5;
  +      jjStopStringLiteralDfa_2(2, active0);
  +      return 3;
      }
      switch(curChar)
      {
  -      case 100:
  -         return jjMoveStringLiteralDfa6_0(active0, 0x20000000000L);
  -      case 102:
  -         if ((active0 & 0x80000000000L) != 0L)
  -            return jjStartNfaWithStates_0(5, 43, 18);
  +      case 101:
  +         if ((active0 & 0x400000L) != 0L)
  +            return jjStartNfaWithStates_2(3, 22, 8);
            break;
  +      case 115:
  +         return jjMoveStringLiteralDfa4_2(active0, 0x800000L);
         default :
            break;
      }
  -   return jjStartNfa_0(4, active0);
  +   return jjStartNfa_2(2, active0);
   }
  -private final int jjMoveStringLiteralDfa6_0(long old0, long active0)
  +private final int jjMoveStringLiteralDfa4_2(long old0, long active0)
   {
      if (((active0 &= old0)) == 0L)
  -      return jjStartNfa_0(4, old0); 
  +      return jjStartNfa_2(2, old0); 
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_0(5, active0);
  -      return 6;
  +      jjStopStringLiteralDfa_2(3, active0);
  +      return 4;
      }
      switch(curChar)
      {
         case 101:
  -         if ((active0 & 0x20000000000L) != 0L)
  -            return jjStartNfaWithStates_0(6, 41, 18);
  +         if ((active0 & 0x800000L) != 0L)
  +            return jjStartNfaWithStates_2(4, 23, 8);
            break;
         default :
            break;
      }
  -   return jjStartNfa_0(5, active0);
  +   return jjStartNfa_2(3, active0);
   }
  -private final int jjMoveNfa_0(int startState, int curPos)
  +private final int jjMoveNfa_2(int startState, int curPos)
   {
      int[] nextStates;
      int startsAt = 0;
  -   jjnewStateCnt = 19;
  +   jjnewStateCnt = 11;
      int i = 1;
      jjstateSet[0] = startState;
      int j, kind = 0x7fffffff;
  @@ -1777,92 +1931,48 @@
            {
               switch(jjstateSet[--i])
               {
  -               case 0:
  -                  if ((0x3ff000000000000L & l) != 0L)
  -                  {
  -                     if (kind > 48)
  -                        kind = 48;
  -                     jjCheckNAdd(17);
  -                  }
  -                  else if ((0x2400L & l) != 0L)
  -                  {
  -                     if (kind > 24)
  -                        kind = 24;
  -                  }
  +               case 3:
  +                  if (curChar == 46)
  +                     jjstateSet[jjnewStateCnt++] = 10;
                     else if (curChar == 34)
  -                     jjCheckNAddTwoStates(8, 9);
  +                     jjCheckNAddTwoStates(5, 6);
                     else if (curChar == 35)
  -                     jjstateSet[jjnewStateCnt++] = 5;
  -                  else if (curChar == 41)
  -                  {
  -                     if (kind > 5)
  -                        kind = 5;
  -                     jjCheckNAddTwoStates(1, 2);
  -                  }
  -                  if (curChar == 13)
  -                     jjstateSet[jjnewStateCnt++] = 11;
  -                  break;
  -               case 1:
  -                  if (curChar != 32)
  -                     break;
  -                  if (kind > 5)
  -                     kind = 5;
  -                  jjCheckNAddTwoStates(1, 2);
  -                  break;
  -               case 2:
  -                  if (curChar == 10 && kind > 5)
  -                     kind = 5;
  +                     jjstateSet[jjnewStateCnt++] = 2;
                     break;
  -               case 3:
  +               case 0:
                     if (curChar == 42)
  -                     jjstateSet[jjnewStateCnt++] = 4;
  +                     jjstateSet[jjnewStateCnt++] = 1;
                     break;
  -               case 4:
  +               case 1:
                     if ((0xfffffff7ffffffffL & l) != 0L && kind > 10)
                        kind = 10;
                     break;
  -               case 5:
  +               case 2:
                     if (curChar == 42)
  -                     jjstateSet[jjnewStateCnt++] = 3;
  -                  break;
  -               case 6:
  -                  if (curChar == 35)
  -                     jjstateSet[jjnewStateCnt++] = 5;
  +                     jjstateSet[jjnewStateCnt++] = 0;
                     break;
  -               case 7:
  +               case 4:
                     if (curChar == 34)
  -                     jjCheckNAddTwoStates(8, 9);
  +                     jjCheckNAddTwoStates(5, 6);
                     break;
  -               case 8:
  +               case 5:
                     if ((0xfffffffbffffdbffL & l) != 0L)
  -                     jjCheckNAddTwoStates(8, 9);
  +                     jjCheckNAddTwoStates(5, 6);
                     break;
  -               case 9:
  +               case 6:
                     if (curChar == 34 && kind > 21)
                        kind = 21;
  -                  break;
  -               case 10:
  -                  if ((0x2400L & l) != 0L && kind > 24)
  -                     kind = 24;
  -                  break;
  -               case 11:
  -                  if (curChar == 10 && kind > 24)
  -                     kind = 24;
  -                  break;
  -               case 12:
  -                  if (curChar == 13)
  -                     jjstateSet[jjnewStateCnt++] = 11;
  -                  break;
  -               case 14:
  -                  if (curChar == 10 && kind > 40)
  -                     kind = 40;
                     break;
  -               case 17:
  -                  if ((0x3ff000000000000L & l) == 0L)
  +               case 8:
  +                  if ((0x3ff200000000000L & l) == 0L)
                        break;
  -                  if (kind > 48)
  -                     kind = 48;
  -                  jjCheckNAdd(17);
  +                  if (kind > 54)
  +                     kind = 54;
  +                  jjstateSet[jjnewStateCnt++] = 8;
  +                  break;
  +               case 9:
  +                  if (curChar == 46)
  +                     jjstateSet[jjnewStateCnt++] = 10;
                     break;
                  default : break;
               }
  @@ -1875,50 +1985,30 @@
            {
               switch(jjstateSet[--i])
               {
  -               case 0:
  -                  if ((0x7fffffe07fffffeL & l) != 0L)
  -                  {
  -                     if (kind > 50)
  -                        kind = 50;
  -                     jjCheckNAdd(18);
  -                  }
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 15;
  -                  break;
  -               case 15:
  -                  if ((0x7fffffe07fffffeL & l) != 0L)
  -                  {
  -                     if (kind > 50)
  -                        kind = 50;
  -                     jjCheckNAdd(18);
  -                  }
  -                  if (curChar == 110)
  -                     jjstateSet[jjnewStateCnt++] = 13;
  +               case 3:
  +                  if ((0x7fffffe07fffffeL & l) == 0L)
  +                     break;
  +                  if (kind > 54)
  +                     kind = 54;
  +                  jjCheckNAdd(8);
                     break;
  -               case 4:
  +               case 1:
                     if (kind > 10)
                        kind = 10;
                     break;
  -               case 8:
  +               case 5:
                     jjAddStates(2, 3);
                     break;
  -               case 13:
  -                  if (curChar != 100)
  +               case 8:
  +                  if ((0x7fffffe87fffffeL & l) == 0L)
                        break;
  -                  if (kind > 40)
  -                     kind = 40;
  -                  jjstateSet[jjnewStateCnt++] = 14;
  -                  break;
  -               case 16:
  -                  if (curChar == 101)
  -                     jjstateSet[jjnewStateCnt++] = 15;
  +                  if (kind > 54)
  +                     kind = 54;
  +                  jjCheckNAdd(8);
                     break;
  -               case 18:
  -                  if ((0x7fffffe07fffffeL & l) == 0L)
  -                     break;
  -                  if (kind > 50)
  -                     kind = 50;
  -                  jjCheckNAdd(18);
  +               case 10:
  +                  if ((0x7fffffe07fffffeL & l) != 0L && kind > 55)
  +                     kind = 55;
                     break;
                  default : break;
               }
  @@ -1932,11 +2022,11 @@
            {
               switch(jjstateSet[--i])
               {
  -               case 4:
  +               case 1:
                     if ((jjbitVec0[i2] & l2) != 0L && kind > 10)
                        kind = 10;
                     break;
  -               case 8:
  +               case 5:
                     if ((jjbitVec0[i2] & l2) != 0L)
                        jjAddStates(2, 3);
                     break;
  @@ -1951,13 +2041,13 @@
            kind = 0x7fffffff;
         }
         ++curPos;
  -      if ((i = jjnewStateCnt) == (startsAt = 19 - (jjnewStateCnt = startsAt)))
  +      if ((i = jjnewStateCnt) == (startsAt = 11 - (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)
  +private final int jjStopStringLiteralDfa_6(int pos, long active0)
   {
      switch (pos)
      {
  @@ -1969,39 +2059,37 @@
            return -1;
      }
   }
  -private final int jjStartNfa_5(int pos, long active0)
  +private final int jjStartNfa_6(int pos, long active0)
   {
  -   return jjMoveNfa_5(jjStopStringLiteralDfa_5(pos, active0), pos + 1);
  +   return jjMoveNfa_6(jjStopStringLiteralDfa_6(pos, active0), pos + 1);
   }
  -private final int jjStartNfaWithStates_5(int pos, int kind, int state)
  +private final int jjStartNfaWithStates_6(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_6(state, pos + 1);
   }
  -private final int jjMoveStringLiteralDfa0_5()
  +private final int jjMoveStringLiteralDfa0_6()
   {
      switch(curChar)
      {
         case 35:
            jjmatchedKind = 12;
  -         return jjMoveStringLiteralDfa1_5(0xa00L);
  +         return jjMoveStringLiteralDfa1_6(0xa00L);
         case 36:
            jjmatchedKind = 7;
  -         return jjMoveStringLiteralDfa1_5(0x100L);
  -      case 42:
  -         return jjMoveStringLiteralDfa1_5(0x10000L);
  +         return jjMoveStringLiteralDfa1_6(0x100L);
         default :
  -         return jjMoveNfa_5(3, 0);
  +         return jjMoveNfa_6(3, 0);
      }
   }
  -private final int jjMoveStringLiteralDfa1_5(long active0)
  +private final int jjMoveStringLiteralDfa1_6(long active0)
   {
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_5(0, active0);
  +      jjStopStringLiteralDfa_6(0, active0);
         return 1;
      }
      switch(curChar)
  @@ -2013,23 +2101,21 @@
         case 35:
            if ((active0 & 0x200L) != 0L)
               return jjStopAtPos(1, 9);
  -         else if ((active0 & 0x10000L) != 0L)
  -            return jjStopAtPos(1, 16);
            break;
         case 42:
            if ((active0 & 0x800L) != 0L)
  -            return jjStartNfaWithStates_5(1, 11, 0);
  +            return jjStartNfaWithStates_6(1, 11, 0);
            break;
         default :
            break;
      }
  -   return jjStartNfa_5(0, active0);
  +   return jjStartNfa_6(0, active0);
   }
  -private final int jjMoveNfa_5(int startState, int curPos)
  +private final int jjMoveNfa_6(int startState, int curPos)
   {
      int[] nextStates;
      int startsAt = 0;
  -   jjnewStateCnt = 4;
  +   jjnewStateCnt = 7;
      int i = 1;
      jjstateSet[0] = startState;
      int j, kind = 0x7fffffff;
  @@ -2044,6 +2130,17 @@
            {
               switch(jjstateSet[--i])
               {
  +               case 3:
  +                  if ((0x2400L & l) != 0L)
  +                  {
  +                     if (kind > 15)
  +                        kind = 15;
  +                  }
  +                  else if (curChar == 35)
  +                     jjstateSet[jjnewStateCnt++] = 2;
  +                  if (curChar == 13)
  +                     jjstateSet[jjnewStateCnt++] = 5;
  +                  break;
                  case 0:
                     if (curChar == 42)
                        jjstateSet[jjnewStateCnt++] = 1;
  @@ -2056,9 +2153,17 @@
                     if (curChar == 42)
                        jjstateSet[jjnewStateCnt++] = 0;
                     break;
  -               case 3:
  -                  if (curChar == 35)
  -                     jjstateSet[jjnewStateCnt++] = 2;
  +               case 4:
  +                  if ((0x2400L & l) != 0L && kind > 15)
  +                     kind = 15;
  +                  break;
  +               case 5:
  +                  if (curChar == 10 && kind > 15)
  +                     kind = 15;
  +                  break;
  +               case 6:
  +                  if (curChar == 13)
  +                     jjstateSet[jjnewStateCnt++] = 5;
                     break;
                  default : break;
               }
  @@ -2101,96 +2206,55 @@
            kind = 0x7fffffff;
         }
         ++curPos;
  -      if ((i = jjnewStateCnt) == (startsAt = 4 - (jjnewStateCnt = startsAt)))
  +      if ((i = jjnewStateCnt) == (startsAt = 7 - (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_7(int pos, long active0)
   {
      switch (pos)
      {
         case 0:
            if ((active0 & 0x1a00L) != 0L)
               return 2;
  -         if ((active0 & 0xc00000L) != 0L)
  -         {
  -            jjmatchedKind = 54;
  -            return 8;
  -         }
  -         return -1;
  -      case 1:
  -         if ((active0 & 0x800L) != 0L)
  -            return 0;
  -         if ((active0 & 0xc00000L) != 0L)
  -         {
  -            jjmatchedKind = 54;
  -            jjmatchedPos = 1;
  -            return 8;
  -         }
  -         return -1;
  -      case 2:
  -         if ((active0 & 0xc00000L) != 0L)
  -         {
  -            jjmatchedKind = 54;
  -            jjmatchedPos = 2;
  -            return 8;
  -         }
  -         return -1;
  -      case 3:
  -         if ((active0 & 0x400000L) != 0L)
  -            return 8;
  -         if ((active0 & 0x800000L) != 0L)
  -         {
  -            jjmatchedKind = 54;
  -            jjmatchedPos = 3;
  -            return 8;
  -         }
            return -1;
         default :
            return -1;
      }
   }
  -private final int jjStartNfa_3(int pos, long active0)
  +private final int jjStartNfa_7(int pos, long active0)
   {
  -   return jjMoveNfa_3(jjStopStringLiteralDfa_3(pos, active0), pos + 1);
  +   return jjMoveNfa_7(jjStopStringLiteralDfa_7(pos, active0), pos + 1);
   }
  -private final int jjStartNfaWithStates_3(int pos, int kind, int state)
  +private final int jjStartNfaWithStates_7(int pos, int kind, int state)
   {
      jjmatchedKind = kind;
      jjmatchedPos = pos;
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) { return pos + 1; }
  -   return jjMoveNfa_3(state, pos + 1);
  +   return jjMoveNfa_7(state, pos + 1);
   }
  -private final int jjMoveStringLiteralDfa0_3()
  +private final int jjMoveStringLiteralDfa0_7()
   {
      switch(curChar)
      {
         case 35:
            jjmatchedKind = 12;
  -         return jjMoveStringLiteralDfa1_3(0xa00L);
  +         return jjMoveStringLiteralDfa1_7(0xa00L);
         case 36:
            jjmatchedKind = 7;
  -         return jjMoveStringLiteralDfa1_3(0x100L);
  -      case 102:
  -         return jjMoveStringLiteralDfa1_3(0x800000L);
  -      case 116:
  -         return jjMoveStringLiteralDfa1_3(0x400000L);
  -      case 123:
  -         return jjStopAtPos(0, 56);
  -      case 125:
  -         return jjStopAtPos(0, 57);
  +         return jjMoveStringLiteralDfa1_7(0x100L);
         default :
  -         return jjMoveNfa_3(3, 0);
  +         return jjMoveNfa_7(3, 0);
      }
   }
  -private final int jjMoveStringLiteralDfa1_3(long active0)
  +private final int jjMoveStringLiteralDfa1_7(long active0)
   {
      try { curChar = input_stream.readChar(); }
      catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_3(0, active0);
  +      jjStopStringLiteralDfa_7(0, active0);
         return 1;
      }
      switch(curChar)
  @@ -2205,84 +2269,18 @@
            break;
         case 42:
            if ((active0 & 0x800L) != 0L)
  -            return jjStartNfaWithStates_3(1, 11, 0);
  -         break;
  -      case 97:
  -         return jjMoveStringLiteralDfa2_3(active0, 0x800000L);
  -      case 114:
  -         return jjMoveStringLiteralDfa2_3(active0, 0x400000L);
  -      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 108:
  -         return jjMoveStringLiteralDfa3_3(active0, 0x800000L);
  -      case 117:
  -         return jjMoveStringLiteralDfa3_3(active0, 0x400000L);
  -      default :
  -         break;
  -   }
  -   return jjStartNfa_3(1, active0);
  -}
  -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 101:
  -         if ((active0 & 0x400000L) != 0L)
  -            return jjStartNfaWithStates_3(3, 22, 8);
  -         break;
  -      case 115:
  -         return jjMoveStringLiteralDfa4_3(active0, 0x800000L);
  -      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 101:
  -         if ((active0 & 0x800000L) != 0L)
  -            return jjStartNfaWithStates_3(4, 23, 8);
  +            return jjStartNfaWithStates_7(1, 11, 0);
            break;
         default :
            break;
      }
  -   return jjStartNfa_3(3, active0);
  +   return jjStartNfa_7(0, active0);
   }
  -private final int jjMoveNfa_3(int startState, int curPos)
  +private final int jjMoveNfa_7(int startState, int curPos)
   {
      int[] nextStates;
      int startsAt = 0;
  -   jjnewStateCnt = 11;
  +   jjnewStateCnt = 7;
      int i = 1;
      jjstateSet[0] = startState;
      int j, kind = 0x7fffffff;
  @@ -2298,10 +2296,12 @@
               switch(jjstateSet[--i])
               {
                  case 3:
  -                  if (curChar == 46)
  -                     jjstateSet[jjnewStateCnt++] = 10;
  -                  else if (curChar == 34)
  -                     jjCheckNAddTwoStates(5, 6);
  +                  if ((0xffffffe7ffffffffL & l) != 0L)
  +                  {
  +                     if (kind > 14)
  +                        kind = 14;
  +                     jjCheckNAdd(6);
  +                  }
                     else if (curChar == 35)
                        jjstateSet[jjnewStateCnt++] = 2;
                     break;
  @@ -2317,28 +2317,16 @@
                     if (curChar == 42)
                        jjstateSet[jjnewStateCnt++] = 0;
                     break;
  -               case 4:
  -                  if (curChar == 34)
  -                     jjCheckNAddTwoStates(5, 6);
  -                  break;
                  case 5:
  -                  if ((0xfffffffbffffdbffL & l) != 0L)
  -                     jjCheckNAddTwoStates(5, 6);
  +                  if (kind > 13)
  +                     kind = 13;
                     break;
                  case 6:
  -                  if (curChar == 34 && kind > 21)
  -                     kind = 21;
  -                  break;
  -               case 8:
  -                  if ((0x3ff200000000000L & l) == 0L)
  +                  if ((0xffffffe7ffffffffL & l) == 0L)
                        break;
  -                  if (kind > 54)
  -                     kind = 54;
  -                  jjstateSet[jjnewStateCnt++] = 8;
  -                  break;
  -               case 9:
  -                  if (curChar == 46)
  -                     jjstateSet[jjnewStateCnt++] = 10;
  +                  if (kind > 14)
  +                     kind = 14;
  +                  jjCheckNAdd(6);
                     break;
                  default : break;
               }
  @@ -2352,29 +2340,33 @@
               switch(jjstateSet[--i])
               {
                  case 3:
  -                  if ((0x7fffffe07fffffeL & l) == 0L)
  -                     break;
  -                  if (kind > 54)
  -                     kind = 54;
  -                  jjCheckNAdd(8);
  +                  if ((0xffffffffefffffffL & l) != 0L)
  +                  {
  +                     if (kind > 14)
  +                        kind = 14;
  +                     jjCheckNAdd(6);
  +                  }
  +                  else if (curChar == 92)
  +                     jjstateSet[jjnewStateCnt++] = 5;
                     break;
                  case 1:
                     if (kind > 10)
                        kind = 10;
                     break;
  +               case 4:
  +                  if (curChar == 92)
  +                     jjstateSet[jjnewStateCnt++] = 5;
  +                  break;
                  case 5:
  -                  jjAddStates(0, 1);
  +                  if (kind > 13)
  +                     kind = 13;
                     break;
  -               case 8:
  -                  if ((0x7fffffe87fffffeL & l) == 0L)
  +               case 6:
  +                  if ((0xffffffffefffffffL & l) == 0L)
                        break;
  -                  if (kind > 54)
  -                     kind = 54;
  -                  jjCheckNAdd(8);
  -                  break;
  -               case 10:
  -                  if ((0x7fffffe07fffffeL & l) != 0L && kind > 55)
  -                     kind = 55;
  +                  if (kind > 14)
  +                     kind = 14;
  +                  jjCheckNAdd(6);
                     break;
                  default : break;
               }
  @@ -2388,13 +2380,21 @@
            {
               switch(jjstateSet[--i])
               {
  +               case 3:
  +               case 6:
  +                  if ((jjbitVec0[i2] & l2) == 0L)
  +                     break;
  +                  if (kind > 14)
  +                     kind = 14;
  +                  jjCheckNAdd(6);
  +                  break;
                  case 1:
                     if ((jjbitVec0[i2] & l2) != 0L && kind > 10)
                        kind = 10;
                     break;
                  case 5:
  -                  if ((jjbitVec0[i2] & l2) != 0L)
  -                     jjAddStates(0, 1);
  +                  if ((jjbitVec0[i2] & l2) != 0L && kind > 13)
  +                     kind = 13;
                     break;
                  default : break;
               }
  @@ -2407,14 +2407,14 @@
            kind = 0x7fffffff;
         }
         ++curPos;
  -      if ((i = jjnewStateCnt) == (startsAt = 11 - (jjnewStateCnt = startsAt)))
  +      if ((i = jjnewStateCnt) == (startsAt = 7 - (jjnewStateCnt = startsAt)))
            return curPos;
         try { curChar = input_stream.readChar(); }
         catch(java.io.IOException e) { return curPos; }
      }
   }
   static final int[] jjnextStates = {
  -   5, 6, 8, 9, 
  +   8, 9, 5, 6, 
   };
   public static final String[] jjstrLiteralImages = {
   null, null, null, null, null, null, null, null, null, null, null, null, null, 
  
  
  

Mime
View raw message