commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject cvs commit: jakarta-commons/jexl/src/java/org/apache/commons/jexl/parser Parser.java Parser.jj ParserTreeConstants.java ParserVisitor.java
Date Wed, 25 Jun 2003 10:52:02 GMT
geirm       2003/06/25 03:52:02

  Modified:    jexl/src/java/org/apache/commons/jexl/parser Parser.java
                        Parser.jj ParserTreeConstants.java
                        ParserVisitor.java
  Log:
  parser autogen followers
  
  Revision  Changes    Path
  1.4       +308 -269  jakarta-commons/jexl/src/java/org/apache/commons/jexl/parser/Parser.java
  
  Index: Parser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jexl/src/java/org/apache/commons/jexl/parser/Parser.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Parser.java	7 Jun 2002 03:35:30 -0000	1.3
  +++ Parser.java	25 Jun 2003 10:52:02 -0000	1.4
  @@ -1823,6 +1823,22 @@
       }
     }
   
  +  final public void SizeMethod() throws ParseException {
  +                     /*@bgen(jjtree) SizeMethod */
  +  ASTSizeMethod jjtn000 = new ASTSizeMethod(this, JJTSIZEMETHOD);
  +  boolean jjtc000 = true;
  +  jjtree.openNodeScope(jjtn000);
  +    try {
  +      jj_consume_token(14);
  +      jj_consume_token(12);
  +      jj_consume_token(13);
  +    } finally {
  +          if (jjtc000) {
  +            jjtree.closeNodeScope(jjtn000, true);
  +          }
  +    }
  +  }
  +
     final public void Reference() throws ParseException {
                       /*@bgen(jjtree) Reference */
     ASTReference jjtn000 = new ASTReference(this, JJTREFERENCE);
  @@ -1855,11 +1871,15 @@
           } else {
             switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
             case INTEGER_LITERAL:
  +          case 14:
             case IDENTIFIER:
               if (jj_2_7(3)) {
                 Method();
               } else {
                 switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  +              case 14:
  +                SizeMethod();
  +                break;
                 case IDENTIFIER:
                   Identifier();
                   break;
  @@ -1988,46 +2008,46 @@
       return retval;
     }
   
  -  final private boolean jj_3R_69() {
  +  final private boolean jj_3R_71() {
       if (jj_scan_token(17)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_56()) return true;
  +    if (jj_3R_58()) 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_59() {
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_68()) {
  +    if (jj_3R_70()) {
       jj_scanpos = xsp;
  -    if (jj_3R_69()) 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_68() {
  +  final private boolean jj_3R_70() {
       if (jj_scan_token(16)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_56()) return true;
  +    if (jj_3R_58()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_62() {
  +  final private boolean jj_3R_64() {
       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_46() {
  -    if (jj_3R_56()) return true;
  +  final private boolean jj_3R_47() {
  +    if (jj_3R_58()) 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_3R_59()) { jj_scanpos = xsp; break; }
         if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       }
       return false;
  @@ -2041,7 +2061,7 @@
       return false;
     }
   
  -  final private boolean jj_3R_45() {
  +  final private boolean jj_3R_46() {
       if (jj_3R_15()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       if (jj_scan_token(15)) return true;
  @@ -2051,26 +2071,26 @@
       return false;
     }
   
  -  final private boolean jj_3R_36() {
  -    if (jj_3R_46()) return true;
  +  final private boolean jj_3R_34() {
  +    if (jj_3R_18()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_60() {
  -    if (jj_scan_token(FLOAT_LITERAL)) return true;
  +  final private boolean jj_3R_36() {
  +    if (jj_3R_47()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_34() {
  -    if (jj_3R_18()) return true;
  +  final private boolean jj_3R_62() {
  +    if (jj_scan_token(FLOAT_LITERAL)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
     final private boolean jj_3R_35() {
  -    if (jj_3R_45()) return true;
  +    if (jj_3R_46()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
  @@ -2086,7 +2106,7 @@
       return false;
     }
   
  -  final private boolean jj_3R_54() {
  +  final private boolean jj_3R_56() {
       if (jj_scan_token(12)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       if (jj_3R_16()) return true;
  @@ -2108,13 +2128,13 @@
       return false;
     }
   
  -  final private boolean jj_3R_71() {
  +  final private boolean jj_3R_73() {
       if (jj_scan_token(47)) 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_45() {
       if (jj_scan_token(14)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       if (jj_scan_token(12)) return true;
  @@ -2126,102 +2146,114 @@
       return false;
     }
   
  -  final private boolean jj_3R_61() {
  +  final private boolean jj_3R_63() {
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_70()) {
  +    if (jj_3R_72()) {
       jj_scanpos = xsp;
  -    if (jj_3R_71()) return true;
  +    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_70() {
  +  final private boolean jj_3R_72() {
       if (jj_scan_token(46)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_53() {
  +  final private boolean jj_3R_27() {
       if (jj_3R_16()) 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_55() {
  +    if (jj_3R_16()) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    return false;
  +  }
  +
  +  final private boolean jj_3R_65() {
       if (jj_scan_token(45)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_43() {
  +  final private boolean jj_3R_44() {
       if (jj_scan_token(11)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_53()) {
  +    if (jj_3R_55()) {
       jj_scanpos = xsp;
  -    if (jj_3R_54()) return true;
  +    if (jj_3R_56()) 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_27() {
  +  final private boolean jj_3R_41() {
  +    if (jj_3R_37()) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    return false;
  +  }
  +
  +  final private boolean jj_3R_21() {
       if (jj_3R_16()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_52() {
  -    if (jj_3R_63()) return true;
  +  final private boolean jj_3R_54() {
  +    if (jj_3R_65()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_51() {
  -    if (jj_3R_62()) return true;
  +  final private boolean jj_3R_53() {
  +    if (jj_3R_64()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_21() {
  +  final private boolean jj_3R_67() {
       if (jj_3R_16()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_65() {
  -    if (jj_3R_16()) return true;
  +  final private boolean jj_3R_52() {
  +    if (jj_3R_63()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_50() {
  -    if (jj_3R_61()) return true;
  +  final private boolean jj_3R_61() {
  +    if (jj_3R_16()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_49() {
  -    if (jj_3R_60()) return true;
  +  final private boolean jj_3R_51() {
  +    if (jj_3R_62()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_42() {
  +  final private boolean jj_3R_43() {
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_48()) {
  -    jj_scanpos = xsp;
  -    if (jj_3R_49()) {
  -    jj_scanpos = xsp;
       if (jj_3R_50()) {
       jj_scanpos = xsp;
       if (jj_3R_51()) {
       jj_scanpos = xsp;
  -    if (jj_3R_52()) return true;
  +    if (jj_3R_52()) {
  +    jj_scanpos = xsp;
  +    if (jj_3R_53()) {
  +    jj_scanpos = xsp;
  +    if (jj_3R_54()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  @@ -2230,38 +2262,44 @@
       return false;
     }
   
  -  final private boolean jj_3R_48() {
  +  final private boolean jj_3R_50() {
       if (jj_3R_37()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_59() {
  -    if (jj_3R_16()) return true;
  +  final private boolean jj_3R_26() {
  +    if (jj_3R_37()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_26() {
  +  final private boolean jj_3R_40() {
  +    if (jj_3R_18()) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    return false;
  +  }
  +
  +  final private boolean jj_3R_20() {
       if (jj_3R_37()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
     final private boolean jj_3R_32() {
  -    if (jj_3R_44()) return true;
  +    if (jj_3R_45()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_40() {
  -    if (jj_3R_37()) return true;
  +  final private boolean jj_3R_60() {
  +    if (jj_3R_43()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
     final private boolean jj_3R_31() {
  -    if (jj_3R_43()) return true;
  +    if (jj_3R_44()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
  @@ -2276,13 +2314,7 @@
       return false;
     }
   
  -  final private boolean jj_3R_20() {
  -    if (jj_3R_37()) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    return false;
  -  }
  -
  -  final private boolean jj_3R_64() {
  +  final private boolean jj_3R_66() {
       if (jj_3R_37()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
  @@ -2294,14 +2326,8 @@
       return false;
     }
   
  -  final private boolean jj_3R_58() {
  -    if (jj_3R_42()) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    return false;
  -  }
  -
     final private boolean jj_3R_28() {
  -    if (jj_3R_42()) return true;
  +    if (jj_3R_43()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
  @@ -2332,58 +2358,58 @@
       return false;
     }
   
  -  final private boolean jj_3R_106() {
  -    if (jj_3R_15()) return true;
  +  final private boolean jj_3R_39() {
  +    if (jj_3R_48()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_105() {
  -    if (jj_scan_token(44)) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_99()) return true;
  +  final private boolean jj_3R_108() {
  +    if (jj_3R_15()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_39() {
  -    if (jj_3R_18()) return true;
  +  final private boolean jj_3R_19() {
  +    if (jj_3R_17()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_104() {
  -    if (jj_scan_token(43)) return true;
  +  final private boolean jj_3R_107() {
  +    if (jj_scan_token(44)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_99()) return true;
  +    if (jj_3R_101()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_19() {
  -    if (jj_3R_17()) return true;
  +  final private boolean jj_3R_106() {
  +    if (jj_scan_token(43)) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_3R_101()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_103() {
  +  final private boolean jj_3R_105() {
       if (jj_scan_token(42)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_99()) return true;
  +    if (jj_3R_101()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_99() {
  +  final private boolean jj_3R_101() {
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_103()) {
  +    if (jj_3R_105()) {
       jj_scanpos = xsp;
  -    if (jj_3R_104()) {
  +    if (jj_3R_106()) {
       jj_scanpos = xsp;
  -    if (jj_3R_105()) {
  +    if (jj_3R_107()) {
       jj_scanpos = xsp;
  -    if (jj_3R_106()) return true;
  +    if (jj_3R_108()) 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;
  @@ -2391,42 +2417,26 @@
       return false;
     }
   
  -  final private boolean jj_3R_111() {
  +  final private boolean jj_3R_113() {
       if (jj_scan_token(41)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_99()) return true;
  +    if (jj_3R_101()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_76() {
  +  final private boolean jj_3R_78() {
       if (jj_scan_token(54)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_47()) return true;
  +    if (jj_3R_49()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_110() {
  +  final private boolean jj_3R_112() {
       if (jj_scan_token(40)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_99()) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    return false;
  -  }
  -
  -  final private boolean jj_3R_109() {
  -    if (jj_scan_token(39)) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_99()) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    return false;
  -  }
  -
  -  final private boolean jj_3R_108() {
  -    if (jj_scan_token(38)) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_99()) return true;
  +    if (jj_3R_101()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
  @@ -2451,102 +2461,88 @@
       return false;
     }
   
  -  final private boolean jj_3_4() {
  -    if (jj_3R_17()) return true;
  +  final private boolean jj_3R_111() {
  +    if (jj_scan_token(39)) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_3R_101()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_107() {
  -    if (jj_scan_token(37)) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_99()) return true;
  +  final private boolean jj_3_9() {
  +    if (jj_3R_17()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_100() {
  +  final private boolean jj_3R_49() {
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_107()) {
  -    jj_scanpos = xsp;
  -    if (jj_3R_108()) {
  -    jj_scanpos = xsp;
  -    if (jj_3R_109()) {
  +    if (jj_3_9()) {
       jj_scanpos = xsp;
  -    if (jj_3R_110()) {
  +    if (jj_3R_60()) {
       jj_scanpos = xsp;
  -    if (jj_3R_111()) return true;
  +    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;
       } 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_3_9() {
  -    if (jj_3R_17()) return true;
  +  final private boolean jj_3R_110() {
  +    if (jj_scan_token(38)) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_3R_101()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_47() {
  -    Token xsp;
  -    xsp = jj_scanpos;
  -    if (jj_3_9()) {
  -    jj_scanpos = xsp;
  -    if (jj_3R_58()) {
  -    jj_scanpos = xsp;
  -    if (jj_3R_59()) return true;
  +  final private boolean jj_3_4() {
  +    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;
       return false;
     }
   
  -  final private boolean jj_3R_89() {
  -    if (jj_3R_99()) return true;
  +  final private boolean jj_3R_109() {
  +    if (jj_scan_token(37)) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_3R_101()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    Token xsp;
  -    while (true) {
  -      xsp = jj_scanpos;
  -      if (jj_3R_100()) { jj_scanpos = xsp; break; }
  -      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    }
       return false;
     }
   
  -  final private boolean jj_3_5() {
  -    if (jj_3R_18()) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_scan_token(55)) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +  final private boolean jj_3R_102() {
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_19()) {
  +    if (jj_3R_109()) {
       jj_scanpos = xsp;
  -    if (jj_3R_20()) {
  +    if (jj_3R_110()) {
       jj_scanpos = xsp;
  -    if (jj_3R_21()) return true;
  +    if (jj_3R_111()) {
  +    jj_scanpos = xsp;
  +    if (jj_3R_112()) {
  +    jj_scanpos = xsp;
  +    if (jj_3R_113()) 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;
  -    if (jj_scan_token(56)) 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_55() {
  +  final private boolean jj_3_5() {
  +    if (jj_3R_18()) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       if (jj_scan_token(55)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3_4()) {
  +    if (jj_3R_19()) {
       jj_scanpos = xsp;
  -    if (jj_3R_64()) {
  +    if (jj_3R_20()) {
       jj_scanpos = xsp;
  -    if (jj_3R_65()) return true;
  +    if (jj_3R_21()) 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;
  @@ -2561,18 +2557,6 @@
       return false;
     }
   
  -  final private boolean jj_3R_41() {
  -    if (jj_3R_47()) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    Token xsp;
  -    while (true) {
  -      xsp = jj_scanpos;
  -      if (jj_3R_76()) { jj_scanpos = xsp; break; }
  -      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    }
  -    return false;
  -  }
  -
     final private boolean jj_3R_23() {
       Token xsp;
       xsp = jj_scanpos;
  @@ -2580,18 +2564,25 @@
       jj_scanpos = xsp;
       if (jj_3R_39()) {
       jj_scanpos = xsp;
  -    if (jj_3R_40()) 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;
       return false;
     }
   
  -  final private boolean jj_3R_102() {
  -    if (jj_scan_token(36)) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_89()) return true;
  +  final private boolean jj_3R_91() {
  +    if (jj_3R_101()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    Token xsp;
  +    while (true) {
  +      xsp = jj_scanpos;
  +      if (jj_3R_102()) { jj_scanpos = xsp; break; }
  +      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    }
       return false;
     }
   
  @@ -2601,22 +2592,41 @@
       return false;
     }
   
  -  final private boolean jj_3R_101() {
  -    if (jj_scan_token(35)) return true;
  +  final private boolean jj_3R_57() {
  +    if (jj_scan_token(55)) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    Token xsp;
  +    xsp = jj_scanpos;
  +    if (jj_3_4()) {
  +    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;
  -    if (jj_3R_89()) return true;
  +    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_scan_token(56)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_90() {
  +  final private boolean jj_3R_42() {
  +    if (jj_3R_49()) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       Token xsp;
  -    xsp = jj_scanpos;
  -    if (jj_3R_101()) {
  -    jj_scanpos = xsp;
  -    if (jj_3R_102()) return true;
  +    while (true) {
  +      xsp = jj_scanpos;
  +      if (jj_3R_78()) { jj_scanpos = xsp; break; }
  +      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    }
  +    return false;
  +  }
  +
  +  final private boolean jj_3R_104() {
  +    if (jj_scan_token(36)) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_3R_91()) 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;
     }
   
  @@ -2633,21 +2643,38 @@
       return false;
     }
   
  -  final private boolean jj_3R_83() {
  -    if (jj_3R_89()) return true;
  +  final private boolean jj_3R_33() {
  +    if (jj_3R_38()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    Token xsp;
  -    while (true) {
  -      xsp = jj_scanpos;
  -      if (jj_3R_90()) { jj_scanpos = xsp; break; }
  -      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    }
       return false;
     }
   
  -  final private boolean jj_3R_33() {
  -    if (jj_3R_38()) return true;
  +  final private boolean jj_3R_48() {
  +    if (jj_scan_token(14)) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_scan_token(12)) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_scan_token(13)) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    return false;
  +  }
  +
  +  final private boolean jj_3R_103() {
  +    if (jj_scan_token(35)) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_3R_91()) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    return false;
  +  }
  +
  +  final private boolean jj_3R_92() {
  +    Token xsp;
  +    xsp = jj_scanpos;
  +    if (jj_3R_103()) {
  +    jj_scanpos = xsp;
  +    if (jj_3R_104()) 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;
     }
   
  @@ -2667,40 +2694,52 @@
       return false;
     }
   
  +  final private boolean jj_3R_85() {
  +    if (jj_3R_91()) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    Token xsp;
  +    while (true) {
  +      xsp = jj_scanpos;
  +      if (jj_3R_92()) { jj_scanpos = xsp; break; }
  +      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    }
  +    return false;
  +  }
  +
     final private boolean jj_3R_38() {
       if (jj_3R_18()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       Token xsp;
  -    if (jj_3R_55()) return true;
  +    if (jj_3R_57()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       while (true) {
         xsp = jj_scanpos;
  -      if (jj_3R_55()) { jj_scanpos = xsp; break; }
  +      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_98() {
  +  final private boolean jj_3R_100() {
       if (jj_scan_token(34)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_83()) return true;
  +    if (jj_3R_85()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_97() {
  +  final private boolean jj_3R_99() {
       if (jj_scan_token(33)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_83()) return true;
  +    if (jj_3R_85()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_96() {
  +  final private boolean jj_3R_98() {
       if (jj_scan_token(32)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_83()) return true;
  +    if (jj_3R_85()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
  @@ -2712,60 +2751,56 @@
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_41()) jj_scanpos = xsp;
  +    if (jj_3R_42()) jj_scanpos = xsp;
       else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       if (jj_scan_token(13)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_95() {
  +  final private boolean jj_3R_97() {
       if (jj_scan_token(31)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_83()) return true;
  +    if (jj_3R_85()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_94() {
  +  final private boolean jj_3R_96() {
       if (jj_scan_token(30)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_83()) return true;
  +    if (jj_3R_85()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_93() {
  +  final private boolean jj_3R_95() {
       if (jj_scan_token(29)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_83()) return true;
  +    if (jj_3R_85()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_92() {
  +  final private boolean jj_3R_94() {
       if (jj_scan_token(28)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_83()) return true;
  +    if (jj_3R_85()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_91() {
  +  final private boolean jj_3R_93() {
       if (jj_scan_token(27)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_83()) return true;
  +    if (jj_3R_85()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_84() {
  +  final private boolean jj_3R_86() {
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_91()) {
  -    jj_scanpos = xsp;
  -    if (jj_3R_92()) {
  -    jj_scanpos = xsp;
       if (jj_3R_93()) {
       jj_scanpos = xsp;
       if (jj_3R_94()) {
  @@ -2776,7 +2811,11 @@
       jj_scanpos = xsp;
       if (jj_3R_97()) {
       jj_scanpos = xsp;
  -    if (jj_3R_98()) return true;
  +    if (jj_3R_98()) {
  +    jj_scanpos = xsp;
  +    if (jj_3R_99()) {
  +    jj_scanpos = xsp;
  +    if (jj_3R_100()) 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;
  @@ -2788,60 +2827,60 @@
       return false;
     }
   
  -  final private boolean jj_3R_81() {
  -    if (jj_3R_83()) return true;
  +  final private boolean jj_3R_83() {
  +    if (jj_3R_85()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       Token xsp;
       while (true) {
         xsp = jj_scanpos;
  -      if (jj_3R_84()) { jj_scanpos = xsp; break; }
  +      if (jj_3R_86()) { jj_scanpos = xsp; break; }
         if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       }
       return false;
     }
   
  -  final private boolean jj_3R_88() {
  +  final private boolean jj_3R_90() {
       if (jj_scan_token(26)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_81()) return true;
  +    if (jj_3R_83()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_87() {
  +  final private boolean jj_3R_89() {
       if (jj_scan_token(25)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_81()) return true;
  +    if (jj_3R_83()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_86() {
  +  final private boolean jj_3R_88() {
       if (jj_scan_token(24)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_81()) return true;
  +    if (jj_3R_83()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_85() {
  +  final private boolean jj_3R_87() {
       if (jj_scan_token(23)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_81()) return true;
  +    if (jj_3R_83()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_82() {
  +  final private boolean jj_3R_84() {
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_85()) {
  +    if (jj_3R_87()) {
       jj_scanpos = xsp;
  -    if (jj_3R_86()) {
  +    if (jj_3R_88()) {
       jj_scanpos = xsp;
  -    if (jj_3R_87()) {
  +    if (jj_3R_89()) {
       jj_scanpos = xsp;
  -    if (jj_3R_88()) return true;
  +    if (jj_3R_90()) 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;
  @@ -2849,33 +2888,33 @@
       return false;
     }
   
  -  final private boolean jj_3R_79() {
  -    if (jj_3R_81()) return true;
  +  final private boolean jj_3R_81() {
  +    if (jj_3R_83()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       Token xsp;
       while (true) {
         xsp = jj_scanpos;
  -      if (jj_3R_82()) { jj_scanpos = xsp; break; }
  +      if (jj_3R_84()) { jj_scanpos = xsp; break; }
         if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       }
       return false;
     }
   
  -  final private boolean jj_3R_80() {
  +  final private boolean jj_3R_82() {
       if (jj_scan_token(22)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_79()) return true;
  +    if (jj_3R_81()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_77() {
  -    if (jj_3R_79()) return true;
  +  final private boolean jj_3R_79() {
  +    if (jj_3R_81()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       Token xsp;
       while (true) {
         xsp = jj_scanpos;
  -      if (jj_3R_80()) { jj_scanpos = xsp; break; }
  +      if (jj_3R_82()) { jj_scanpos = xsp; break; }
         if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       }
       return false;
  @@ -2889,10 +2928,10 @@
       return false;
     }
   
  -  final private boolean jj_3R_78() {
  +  final private boolean jj_3R_80() {
       if (jj_scan_token(21)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_77()) return true;
  +    if (jj_3R_79()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
  @@ -2905,72 +2944,72 @@
       return false;
     }
   
  -  final private boolean jj_3R_72() {
  -    if (jj_3R_77()) return true;
  +  final private boolean jj_3R_74() {
  +    if (jj_3R_79()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       Token xsp;
       while (true) {
         xsp = jj_scanpos;
  -      if (jj_3R_78()) { jj_scanpos = xsp; break; }
  +      if (jj_3R_80()) { jj_scanpos = xsp; break; }
         if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       }
       return false;
     }
   
  -  final private boolean jj_3R_73() {
  +  final private boolean jj_3R_75() {
       if (jj_scan_token(20)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_72()) return true;
  +    if (jj_3R_74()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_66() {
  -    if (jj_3R_72()) return true;
  +  final private boolean jj_3R_68() {
  +    if (jj_3R_74()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       Token xsp;
       while (true) {
         xsp = jj_scanpos;
  -      if (jj_3R_73()) { jj_scanpos = xsp; break; }
  +      if (jj_3R_75()) { jj_scanpos = xsp; break; }
         if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       }
       return false;
     }
   
  -  final private boolean jj_3R_75() {
  +  final private boolean jj_3R_77() {
       if (jj_scan_token(19)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_66()) 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_67() {
  +  final private boolean jj_3R_69() {
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_74()) {
  +    if (jj_3R_76()) {
       jj_scanpos = xsp;
  -    if (jj_3R_75()) return true;
  +    if (jj_3R_77()) 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_74() {
  +  final private boolean jj_3R_76() {
       if (jj_scan_token(18)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_66()) 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_56() {
  -    if (jj_3R_66()) return true;
  +  final private boolean jj_3R_58() {
  +    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_67()) { jj_scanpos = xsp; break; }
  +      if (jj_3R_69()) { jj_scanpos = xsp; break; }
         if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       }
       return false;
  @@ -2986,7 +3025,7 @@
     private boolean jj_semLA;
     private int jj_gen;
     final private int[] jj_la1 = new int[34];
  -  final private int[] jj_la1_0 = {0x5b80,0x5b80,0x1000,0x5980,0x30000,0x30000,0xc0000,0xc0000,0x100000,0x200000,0x400000,0x7800000,0x7800000,0xf8000000,0xf8000000,0x0,0x0,0x0,0x0,0x5980,0x5980,0x180,0x0,0x200,0x5980,0x0,0x0,0x5980,0x80,0x0,0x0,0x80,0x80,0x180,};
  +  final private int[] jj_la1_0 = {0x5b80,0x5b80,0x1000,0x5980,0x30000,0x30000,0xc0000,0xc0000,0x100000,0x200000,0x400000,0x7800000,0x7800000,0xf8000000,0xf8000000,0x0,0x0,0x0,0x0,0x5980,0x5980,0x180,0x0,0x200,0x5980,0x0,0x0,0x5980,0x80,0x0,0x0,0x4080,0x4080,0x180,};
     final private int[] jj_la1_1 = {0x241bfc00,0x241bfc00,0x4000000,0x2400fc00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7,0x7,0x18,0x18,0x3e0,0x3e0,0x2400fc00,0x2400e000,0x2000e000,0xc000,0x10000,0x241afc00,0x40000,0x400000,0x2400fc00,0x4000000,0x800000,0x4000000,0x4000000,0x4000000,0x2400e000,};
     final private JJCalls[] jj_2_rtns = new JJCalls[9];
     private boolean jj_rescan = false;
  
  
  
  1.6       +22 -2     jakarta-commons/jexl/src/java/org/apache/commons/jexl/parser/Parser.jj
  
  Index: Parser.jj
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jexl/src/java/org/apache/commons/jexl/parser/Parser.jj,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Parser.jj	7 Jun 2002 03:35:30 -0000	1.5
  +++ Parser.jj	25 Jun 2003 10:52:02 -0000	1.6
  @@ -57,6 +57,8 @@
    *  Jexl : Java Expression Language
    *
    *  @author <a href="mailto:geirm@apache.org">Geir Magnusson Jr.</a>
  + *  @author <a href="mailto:mhw@kremvax.net">Mark H. Wilkinson</a>
  + *
    *  @version $Id$
    */
   
  @@ -1707,6 +1709,23 @@
   /*@egen*/
   }
   
  +void SizeMethod() : {/*@bgen(jjtree) SizeMethod */
  +  ASTSizeMethod jjtn000 = new ASTSizeMethod(this, JJTSIZEMETHOD);
  +  boolean jjtc000 = true;
  +  jjtree.openNodeScope(jjtn000);
  +/*@egen*/}
  +{/*@bgen(jjtree) SizeMethod */
  +        try {
  +/*@egen*/
  +	"size" "(" ")"/*@bgen(jjtree)*/
  +        } finally {
  +          if (jjtc000) {
  +            jjtree.closeNodeScope(jjtn000, true);
  +          }
  +        }
  +/*@egen*/
  +}
  +
   void Reference() : {/*@bgen(jjtree) Reference */
     ASTReference jjtn000 = new ASTReference(this, JJTREFERENCE);
     boolean jjtc000 = true;
  @@ -1719,7 +1738,8 @@
     (LOOKAHEAD(2) "."
       (
         LOOKAHEAD(Identifier() "[" ( Expression() | IntegerLiteral() | Reference()) "]")
ArrayAccess() |
  -      (LOOKAHEAD(3) Method() | Identifier() |  IntegerLiteral() )
  +//      (LOOKAHEAD(3) Method() | Identifier() |  IntegerLiteral() )
  +      (LOOKAHEAD(3) Method() | SizeMethod() | Identifier() |  IntegerLiteral() )
   
       )
     )*/*@bgen(jjtree)*/
  
  
  
  1.2       +3 -1      jakarta-commons/jexl/src/java/org/apache/commons/jexl/parser/ParserTreeConstants.java
  
  Index: ParserTreeConstants.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jexl/src/java/org/apache/commons/jexl/parser/ParserTreeConstants.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ParserTreeConstants.java	26 Apr 2002 04:23:14 -0000	1.1
  +++ ParserTreeConstants.java	25 Jun 2003 10:52:02 -0000	1.2
  @@ -44,7 +44,8 @@
     public int JJTFOREACHSTATEMENT = 37;
     public int JJTMETHOD = 38;
     public int JJTARRAYACCESS = 39;
  -  public int JJTREFERENCE = 40;
  +  public int JJTSIZEMETHOD = 40;
  +  public int JJTREFERENCE = 41;
   
   
     public String[] jjtNodeName = {
  @@ -88,6 +89,7 @@
       "ForeachStatement",
       "Method",
       "ArrayAccess",
  +    "SizeMethod",
       "Reference",
     };
   }
  
  
  
  1.2       +1 -0      jakarta-commons/jexl/src/java/org/apache/commons/jexl/parser/ParserVisitor.java
  
  Index: ParserVisitor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jexl/src/java/org/apache/commons/jexl/parser/ParserVisitor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ParserVisitor.java	26 Apr 2002 04:23:14 -0000	1.1
  +++ ParserVisitor.java	25 Jun 2003 10:52:02 -0000	1.2
  @@ -44,5 +44,6 @@
     public Object visit(ASTForeachStatement node, Object data);
     public Object visit(ASTMethod node, Object data);
     public Object visit(ASTArrayAccess node, Object data);
  +  public Object visit(ASTSizeMethod node, Object data);
     public Object visit(ASTReference node, Object data);
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message