kaz         02/04/21 19:00:21

  Modified:    src/java/org/apache/maven/java/parser JavaParser.java
                        JavaParser.jj JavaParserConstants.java
                        JavaParserTokenManager.java
                        JavaParserTreeConstants.java JavaParserVisitor.java
  Log:
  See the commit log for JavaParser.jjt for details.  These are generated
  source files by JavaCC.
  
  Revision  Changes    Path
  1.4       +242 -218  
jakarta-turbine-maven/src/java/org/apache/maven/java/parser/JavaParser.java
  
  Index: JavaParser.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/java/parser/JavaParser.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JavaParser.java   16 Apr 2002 18:14:50 -0000      1.3
  +++ JavaParser.java   22 Apr 2002 02:00:21 -0000      1.4
  @@ -5,7 +5,8 @@
   import java.io.ByteArrayInputStream;
   
   public class JavaParser/*@bgen(jjtree)*/implements JavaParserTreeConstants, 
JavaParserConstants {/*@bgen(jjtree)*/
  -  protected JJTJavaParserState jjtree = new JJTJavaParserState();/** 
  +  protected JJTJavaParserState jjtree = new JJTJavaParserState();
  +    /** 
        * This constructor was added to allow the re-use of parsers.
        * The normal constructor takes a single argument which 
        * an InputStream. This simply creates a re-usable parser
  @@ -89,15 +90,6 @@
           }
           ImportDeclaration();
         }
  -      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  -      case ASTERIX:
  -      case TEXT:
  -        JavaDocEntry();
  -        break;
  -      default:
  -        jj_la1[2] = jj_gen;
  -        ;
  -      }
         label_2:
         while (true) {
           switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  @@ -108,12 +100,23 @@
           case PUBLIC:
           case STRICTFP:
           case SEMICOLON:
  +        case ASTERIX:
  +        case TEXT:
             ;
             break;
           default:
  -          jj_la1[3] = jj_gen;
  +          jj_la1[2] = jj_gen;
             break label_2;
           }
  +        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  +        case ASTERIX:
  +        case TEXT:
  +          JavaDocEntry();
  +          break;
  +        default:
  +          jj_la1[3] = jj_gen;
  +          ;
  +        }
           TypeDeclaration();
         }
         jj_consume_token(0);
  @@ -833,12 +836,23 @@
           case VOLATILE:
           case STRICTFP:
           case IDENTIFIER:
  +        case ASTERIX:
  +        case TEXT:
             ;
             break;
           default:
             jj_la1[22] = jj_gen;
             break label_9;
           }
  +        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  +        case ASTERIX:
  +        case TEXT:
  +          JavaDocEntry();
  +          break;
  +        default:
  +          jj_la1[23] = jj_gen;
  +          ;
  +        }
           InterfaceMemberDeclaration();
         }
         jj_consume_token(RBRACE);
  @@ -896,7 +910,7 @@
             FieldDeclaration();
             break;
           default:
  -          jj_la1[23] = jj_gen;
  +          jj_la1[24] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
  @@ -941,7 +955,7 @@
             ;
             break;
           default:
  -          jj_la1[24] = jj_gen;
  +          jj_la1[25] = jj_gen;
             break label_10;
           }
           switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  @@ -967,7 +981,7 @@
             jj_consume_token(VOLATILE);
             break;
           default:
  -          jj_la1[25] = jj_gen;
  +          jj_la1[26] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
  @@ -981,7 +995,7 @@
             ;
             break;
           default:
  -          jj_la1[26] = jj_gen;
  +          jj_la1[27] = jj_gen;
             break label_11;
           }
           jj_consume_token(COMMA);
  @@ -1022,7 +1036,7 @@
           VariableInitializer();
           break;
         default:
  -        jj_la1[27] = jj_gen;
  +        jj_la1[28] = jj_gen;
           ;
         }
       } catch (Throwable jjte000) {
  @@ -1060,7 +1074,7 @@
             ;
             break;
           default:
  -          jj_la1[28] = jj_gen;
  +          jj_la1[29] = jj_gen;
             break label_12;
           }
           jj_consume_token(LBRACKET);
  @@ -1113,7 +1127,7 @@
           Expression();
           break;
         default:
  -        jj_la1[29] = jj_gen;
  +        jj_la1[30] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
  @@ -1187,7 +1201,7 @@
           }
           break;
         default:
  -        jj_la1[30] = jj_gen;
  +        jj_la1[31] = jj_gen;
           ;
         }
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  @@ -1195,7 +1209,7 @@
           jj_consume_token(COMMA);
           break;
         default:
  -        jj_la1[31] = jj_gen;
  +        jj_la1[32] = jj_gen;
           ;
         }
         jj_consume_token(RBRACE);
  @@ -1241,7 +1255,7 @@
             ;
             break;
           default:
  -          jj_la1[32] = jj_gen;
  +          jj_la1[33] = jj_gen;
             break label_14;
           }
           switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  @@ -1273,7 +1287,7 @@
             jj_consume_token(STRICTFP);
             break;
           default:
  -          jj_la1[33] = jj_gen;
  +          jj_la1[34] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
  @@ -1286,7 +1300,7 @@
           NameList();
           break;
         default:
  -        jj_la1[34] = jj_gen;
  +        jj_la1[35] = jj_gen;
           ;
         }
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  @@ -1297,7 +1311,7 @@
           jj_consume_token(SEMICOLON);
           break;
         default:
  -        jj_la1[35] = jj_gen;
  +        jj_la1[36] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
  @@ -1337,7 +1351,7 @@
             ;
             break;
           default:
  -          jj_la1[36] = jj_gen;
  +          jj_la1[37] = jj_gen;
             break label_15;
           }
           jj_consume_token(LBRACKET);
  @@ -1390,7 +1404,7 @@
               ;
               break;
             default:
  -            jj_la1[37] = jj_gen;
  +            jj_la1[38] = jj_gen;
               break label_16;
             }
             jj_consume_token(COMMA);
  @@ -1398,7 +1412,7 @@
           }
           break;
         default:
  -        jj_la1[38] = jj_gen;
  +        jj_la1[39] = jj_gen;
           ;
         }
         jj_consume_token(RPAREN);
  @@ -1434,7 +1448,7 @@
           jj_consume_token(FINAL);
           break;
         default:
  -        jj_la1[39] = jj_gen;
  +        jj_la1[40] = jj_gen;
           ;
         }
         Type();
  @@ -1481,13 +1495,13 @@
             jj_consume_token(PRIVATE);
             break;
           default:
  -          jj_la1[40] = jj_gen;
  +          jj_la1[41] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
           break;
         default:
  -        jj_la1[41] = jj_gen;
  +        jj_la1[42] = jj_gen;
           ;
         }
         jj_consume_token(IDENTIFIER);
  @@ -1498,7 +1512,7 @@
           NameList();
           break;
         default:
  -        jj_la1[42] = jj_gen;
  +        jj_la1[43] = jj_gen;
           ;
         }
         jj_consume_token(LBRACE);
  @@ -1552,7 +1566,7 @@
             ;
             break;
           default:
  -          jj_la1[43] = jj_gen;
  +          jj_la1[44] = jj_gen;
             break label_17;
           }
           BlockStatement();
  @@ -1623,7 +1637,7 @@
             jj_consume_token(SEMICOLON);
             break;
           default:
  -          jj_la1[44] = jj_gen;
  +          jj_la1[45] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
  @@ -1660,7 +1674,7 @@
           jj_consume_token(STATIC);
           break;
         default:
  -        jj_la1[45] = jj_gen;
  +        jj_la1[46] = jj_gen;
           ;
         }
         Block();
  @@ -1709,7 +1723,7 @@
           Name();
           break;
         default:
  -        jj_la1[46] = jj_gen;
  +        jj_la1[47] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
  @@ -1720,7 +1734,7 @@
             ;
             break;
           default:
  -          jj_la1[47] = jj_gen;
  +          jj_la1[48] = jj_gen;
             break label_18;
           }
           jj_consume_token(LBRACKET);
  @@ -1779,7 +1793,7 @@
           jj_consume_token(DOUBLE);
           break;
         default:
  -        jj_la1[48] = jj_gen;
  +        jj_la1[49] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
  @@ -1812,7 +1826,7 @@
           Type();
           break;
         default:
  -        jj_la1[49] = jj_gen;
  +        jj_la1[50] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
  @@ -1875,7 +1889,7 @@
             ;
             break;
           default:
  -          jj_la1[50] = jj_gen;
  +          jj_la1[51] = jj_gen;
             break label_20;
           }
           jj_consume_token(COMMA);
  @@ -1929,7 +1943,7 @@
           Expression();
           break;
         default:
  -        jj_la1[51] = jj_gen;
  +        jj_la1[52] = jj_gen;
           ;
         }
       } catch (Throwable jjte000) {
  @@ -1997,7 +2011,7 @@
           jj_consume_token(ORASSIGN);
           break;
         default:
  -        jj_la1[52] = jj_gen;
  +        jj_la1[53] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
  @@ -2023,7 +2037,7 @@
           ConditionalExpression();
           break;
         default:
  -        jj_la1[53] = jj_gen;
  +        jj_la1[54] = jj_gen;
           ;
         }
       } catch (Throwable jjte000) {
  @@ -2061,7 +2075,7 @@
             ;
             break;
           default:
  -          jj_la1[54] = jj_gen;
  +          jj_la1[55] = jj_gen;
             break label_21;
           }
           jj_consume_token(SC_OR);
  @@ -2102,7 +2116,7 @@
             ;
             break;
           default:
  -          jj_la1[55] = jj_gen;
  +          jj_la1[56] = jj_gen;
             break label_22;
           }
           jj_consume_token(SC_AND);
  @@ -2143,7 +2157,7 @@
             ;
             break;
           default:
  -          jj_la1[56] = jj_gen;
  +          jj_la1[57] = jj_gen;
             break label_23;
           }
           jj_consume_token(BIT_OR);
  @@ -2184,7 +2198,7 @@
             ;
             break;
           default:
  -          jj_la1[57] = jj_gen;
  +          jj_la1[58] = jj_gen;
             break label_24;
           }
           jj_consume_token(XOR);
  @@ -2225,7 +2239,7 @@
             ;
             break;
           default:
  -          jj_la1[58] = jj_gen;
  +          jj_la1[59] = jj_gen;
             break label_25;
           }
           jj_consume_token(BIT_AND);
  @@ -2267,7 +2281,7 @@
             ;
             break;
           default:
  -          jj_la1[59] = jj_gen;
  +          jj_la1[60] = jj_gen;
             break label_26;
           }
           switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  @@ -2278,7 +2292,7 @@
             jj_consume_token(NE);
             break;
           default:
  -          jj_la1[60] = jj_gen;
  +          jj_la1[61] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
  @@ -2318,7 +2332,7 @@
           Type();
           break;
         default:
  -        jj_la1[61] = jj_gen;
  +        jj_la1[62] = jj_gen;
           ;
         }
       } catch (Throwable jjte000) {
  @@ -2359,7 +2373,7 @@
             ;
             break;
           default:
  -          jj_la1[62] = jj_gen;
  +          jj_la1[63] = jj_gen;
             break label_27;
           }
           switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  @@ -2376,7 +2390,7 @@
             jj_consume_token(GE);
             break;
           default:
  -          jj_la1[63] = jj_gen;
  +          jj_la1[64] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
  @@ -2419,7 +2433,7 @@
             ;
             break;
           default:
  -          jj_la1[64] = jj_gen;
  +          jj_la1[65] = jj_gen;
             break label_28;
           }
           switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  @@ -2433,7 +2447,7 @@
             jj_consume_token(RUNSIGNEDSHIFT);
             break;
           default:
  -          jj_la1[65] = jj_gen;
  +          jj_la1[66] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
  @@ -2475,7 +2489,7 @@
             ;
             break;
           default:
  -          jj_la1[66] = jj_gen;
  +          jj_la1[67] = jj_gen;
             break label_29;
           }
           switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  @@ -2486,7 +2500,7 @@
             jj_consume_token(MINUS);
             break;
           default:
  -          jj_la1[67] = jj_gen;
  +          jj_la1[68] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
  @@ -2529,7 +2543,7 @@
             ;
             break;
           default:
  -          jj_la1[68] = jj_gen;
  +          jj_la1[69] = jj_gen;
             break label_30;
           }
           switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
  @@ -2543,7 +2557,7 @@
             jj_consume_token(REM);
             break;
           default:
  -          jj_la1[69] = jj_gen;
  +          jj_la1[70] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
  @@ -2587,7 +2601,7 @@
             jj_consume_token(MINUS);
             break;
           default:
  -          jj_la1[70] = jj_gen;
  +          jj_la1[71] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
  @@ -2625,7 +2639,7 @@
           UnaryExpressionNotPlusMinus();
           break;
         default:
  -        jj_la1[71] = jj_gen;
  +        jj_la1[72] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
  @@ -2725,14 +2739,14 @@
             jj_consume_token(BANG);
             break;
           default:
  -          jj_la1[72] = jj_gen;
  +          jj_la1[73] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
           UnaryExpression();
           break;
         default:
  -        jj_la1[73] = jj_gen;
  +        jj_la1[74] = jj_gen;
           if (jj_2_15(2147483647)) {
             CastExpression();
           } else {
  @@ -2761,7 +2775,7 @@
               PostfixExpression();
               break;
             default:
  -            jj_la1[74] = jj_gen;
  +            jj_la1[75] = jj_gen;
               jj_consume_token(-1);
               throw new ParseException();
             }
  @@ -2843,13 +2857,13 @@
               Literal();
               break;
             default:
  -            jj_la1[75] = jj_gen;
  +            jj_la1[76] = jj_gen;
               jj_consume_token(-1);
               throw new ParseException();
             }
             break;
           default:
  -          jj_la1[76] = jj_gen;
  +          jj_la1[77] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
  @@ -2893,13 +2907,13 @@
             jj_consume_token(DECR);
             break;
           default:
  -          jj_la1[77] = jj_gen;
  +          jj_la1[78] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
           break;
         default:
  -        jj_la1[78] = jj_gen;
  +        jj_la1[79] = jj_gen;
           ;
         }
       } catch (Throwable jjte000) {
  @@ -2943,7 +2957,7 @@
             UnaryExpressionNotPlusMinus();
             break;
           default:
  -          jj_la1[79] = jj_gen;
  +          jj_la1[80] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
  @@ -3039,7 +3053,7 @@
           AllocationExpression();
           break;
         default:
  -        jj_la1[80] = jj_gen;
  +        jj_la1[81] = jj_gen;
           if (jj_2_20(2147483647)) {
             ResultType();
             jj_consume_token(DOT);
  @@ -3050,7 +3064,7 @@
               Name();
               break;
             default:
  -            jj_la1[81] = jj_gen;
  +            jj_la1[82] = jj_gen;
               jj_consume_token(-1);
               throw new ParseException();
             }
  @@ -3104,7 +3118,7 @@
             Arguments();
             break;
           default:
  -          jj_la1[82] = jj_gen;
  +          jj_la1[83] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
  @@ -3157,7 +3171,7 @@
           NullLiteral();
           break;
         default:
  -        jj_la1[83] = jj_gen;
  +        jj_la1[84] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
  @@ -3196,7 +3210,7 @@
           jj_consume_token(FALSE);
           break;
         default:
  -        jj_la1[84] = jj_gen;
  +        jj_la1[85] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
  @@ -3259,7 +3273,7 @@
           ArgumentList();
           break;
         default:
  -        jj_la1[85] = jj_gen;
  +        jj_la1[86] = jj_gen;
           ;
         }
         jj_consume_token(RPAREN);
  @@ -3298,7 +3312,7 @@
             ;
             break;
           default:
  -          jj_la1[86] = jj_gen;
  +          jj_la1[87] = jj_gen;
             break label_32;
           }
           jj_consume_token(COMMA);
  @@ -3351,18 +3365,18 @@
                 ClassBody();
                 break;
               default:
  -              jj_la1[87] = jj_gen;
  +              jj_la1[88] = jj_gen;
                 ;
               }
               break;
             default:
  -            jj_la1[88] = jj_gen;
  +            jj_la1[89] = jj_gen;
               jj_consume_token(-1);
               throw new ParseException();
             }
             break;
           default:
  -          jj_la1[89] = jj_gen;
  +          jj_la1[90] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
  @@ -3432,14 +3446,14 @@
                 ;
                 break;
               default:
  -              jj_la1[90] = jj_gen;
  +              jj_la1[91] = jj_gen;
                 break label_35;
               }
             }
             ArrayInitializer();
             break;
           default:
  -          jj_la1[91] = jj_gen;
  +          jj_la1[92] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
  @@ -3544,7 +3558,7 @@
             TryStatement();
             break;
           default:
  -          jj_la1[92] = jj_gen;
  +          jj_la1[93] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
  @@ -3652,7 +3666,7 @@
             ;
             break;
           default:
  -          jj_la1[93] = jj_gen;
  +          jj_la1[94] = jj_gen;
             break label_36;
           }
           BlockStatement();
  @@ -3735,7 +3749,7 @@
             UnmodifiedInterfaceDeclaration();
             break;
           default:
  -          jj_la1[94] = jj_gen;
  +          jj_la1[95] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
  @@ -3772,7 +3786,7 @@
           jj_consume_token(FINAL);
           break;
         default:
  -        jj_la1[95] = jj_gen;
  +        jj_la1[96] = jj_gen;
           ;
         }
         Type();
  @@ -3784,7 +3798,7 @@
             ;
             break;
           default:
  -          jj_la1[96] = jj_gen;
  +          jj_la1[97] = jj_gen;
             break label_37;
           }
           jj_consume_token(COMMA);
  @@ -3898,18 +3912,18 @@
               Expression();
               break;
             default:
  -            jj_la1[97] = jj_gen;
  +            jj_la1[98] = jj_gen;
               jj_consume_token(-1);
               throw new ParseException();
             }
             break;
           default:
  -          jj_la1[98] = jj_gen;
  +          jj_la1[99] = jj_gen;
             ;
           }
           break;
         default:
  -        jj_la1[99] = jj_gen;
  +        jj_la1[100] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
  @@ -3953,7 +3967,7 @@
             ;
             break;
           default:
  -          jj_la1[100] = jj_gen;
  +          jj_la1[101] = jj_gen;
             break label_38;
           }
           SwitchLabel();
  @@ -4002,7 +4016,7 @@
               ;
               break;
             default:
  -            jj_la1[101] = jj_gen;
  +            jj_la1[102] = jj_gen;
               break label_39;
             }
             BlockStatement();
  @@ -4047,7 +4061,7 @@
           jj_consume_token(COLON);
           break;
         default:
  -        jj_la1[102] = jj_gen;
  +        jj_la1[103] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
  @@ -4089,7 +4103,7 @@
           Statement();
           break;
         default:
  -        jj_la1[103] = jj_gen;
  +        jj_la1[104] = jj_gen;
           ;
         }
       } catch (Throwable jjte000) {
  @@ -4215,7 +4229,7 @@
           ForInit();
           break;
         default:
  -        jj_la1[104] = jj_gen;
  +        jj_la1[105] = jj_gen;
           ;
         }
         jj_consume_token(SEMICOLON);
  @@ -4250,7 +4264,7 @@
           Expression();
           break;
         default:
  -        jj_la1[105] = jj_gen;
  +        jj_la1[106] = jj_gen;
           ;
         }
         jj_consume_token(SEMICOLON);
  @@ -4281,7 +4295,7 @@
           ForUpdate();
           break;
         default:
  -        jj_la1[106] = jj_gen;
  +        jj_la1[107] = jj_gen;
           ;
         }
         jj_consume_token(RPAREN);
  @@ -4343,7 +4357,7 @@
             StatementExpressionList();
             break;
           default:
  -          jj_la1[107] = jj_gen;
  +          jj_la1[108] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
  @@ -4383,7 +4397,7 @@
             ;
             break;
           default:
  -          jj_la1[108] = jj_gen;
  +          jj_la1[109] = jj_gen;
             break label_40;
           }
           jj_consume_token(COMMA);
  @@ -4450,7 +4464,7 @@
           jj_consume_token(IDENTIFIER);
           break;
         default:
  -        jj_la1[109] = jj_gen;
  +        jj_la1[110] = jj_gen;
           ;
         }
         jj_consume_token(SEMICOLON);
  @@ -4473,7 +4487,7 @@
           jj_consume_token(IDENTIFIER);
           break;
         default:
  -        jj_la1[110] = jj_gen;
  +        jj_la1[111] = jj_gen;
           ;
         }
         jj_consume_token(SEMICOLON);
  @@ -4522,7 +4536,7 @@
           Expression();
           break;
         default:
  -        jj_la1[111] = jj_gen;
  +        jj_la1[112] = jj_gen;
           ;
         }
         jj_consume_token(SEMICOLON);
  @@ -4624,7 +4638,7 @@
             ;
             break;
           default:
  -          jj_la1[112] = jj_gen;
  +          jj_la1[113] = jj_gen;
             break label_41;
           }
           jj_consume_token(CATCH);
  @@ -4639,7 +4653,7 @@
           Block();
           break;
         default:
  -        jj_la1[113] = jj_gen;
  +        jj_la1[114] = jj_gen;
           ;
         }
       } catch (Throwable jjte000) {
  @@ -4680,13 +4694,13 @@
               ;
               break;
             default:
  -            jj_la1[114] = jj_gen;
  +            jj_la1[115] = jj_gen;
               break label_42;
             }
           }
           break;
         default:
  -        jj_la1[115] = jj_gen;
  +        jj_la1[116] = jj_gen;
           ;
         }
       } catch (Throwable jjte000) {
  @@ -4723,7 +4737,7 @@
             jj_consume_token(ASTERIX);
             break;
           default:
  -          jj_la1[116] = jj_gen;
  +          jj_la1[117] = jj_gen;
             ;
           }
           jj_consume_token(TEXT);
  @@ -4733,7 +4747,7 @@
             ;
             break;
           default:
  -          jj_la1[117] = jj_gen;
  +          jj_la1[118] = jj_gen;
             break label_43;
           }
         }
  @@ -4758,7 +4772,7 @@
             ;
             break;
           default:
  -          jj_la1[118] = jj_gen;
  +          jj_la1[119] = jj_gen;
             break label_44;
           }
           jj_consume_token(TEXT);
  @@ -4767,7 +4781,7 @@
             jj_consume_token(ASTERIX);
             break;
           default:
  -          jj_la1[119] = jj_gen;
  +          jj_la1[120] = jj_gen;
             ;
           }
         }
  @@ -4984,11 +4998,11 @@
     final private boolean jj_3R_352() {
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_364()) {
  -    jj_scanpos = xsp;
       if (jj_3R_365()) {
       jj_scanpos = xsp;
  -    if (jj_3R_366()) return true;
  +    if (jj_3R_366()) {
  +    jj_scanpos = xsp;
  +    if (jj_3R_367()) 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;
  @@ -5486,7 +5500,7 @@
       return false;
     }
   
  -  final private boolean jj_3R_362() {
  +  final private boolean jj_3R_363() {
       if (jj_scan_token(COMMA)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       if (jj_3R_50()) return true;
  @@ -5500,7 +5514,7 @@
       Token xsp;
       while (true) {
         xsp = jj_scanpos;
  -      if (jj_3R_362()) { jj_scanpos = xsp; break; }
  +      if (jj_3R_363()) { jj_scanpos = xsp; break; }
         if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       }
       return false;
  @@ -5766,10 +5780,10 @@
       return false;
     }
   
  -  final private boolean jj_3R_361() {
  +  final private boolean jj_3R_362() {
       if (jj_scan_token(COMMA)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    if (jj_3R_360()) return true;
  +    if (jj_3R_361()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
  @@ -5938,16 +5952,16 @@
       return false;
     }
   
  -  final private boolean jj_3R_376() {
  +  final private boolean jj_3R_377() {
       if (jj_scan_token(FINAL)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_360() {
  +  final private boolean jj_3R_361() {
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_376()) jj_scanpos = xsp;
  +    if (jj_3R_377()) jj_scanpos = xsp;
       else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       if (jj_3R_66()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  @@ -5957,12 +5971,12 @@
     }
   
     final private boolean jj_3R_331() {
  -    if (jj_3R_360()) return true;
  +    if (jj_3R_361()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       Token xsp;
       while (true) {
         xsp = jj_scanpos;
  -      if (jj_3R_361()) { jj_scanpos = xsp; break; }
  +      if (jj_3R_362()) { jj_scanpos = xsp; break; }
         if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       }
       return false;
  @@ -6161,7 +6175,7 @@
       return false;
     }
   
  -  final private boolean jj_3R_363() {
  +  final private boolean jj_3R_364() {
       if (jj_scan_token(LBRACKET)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       if (jj_scan_token(RBRACKET)) return true;
  @@ -6255,7 +6269,7 @@
       Token xsp;
       while (true) {
         xsp = jj_scanpos;
  -      if (jj_3R_363()) { jj_scanpos = xsp; break; }
  +      if (jj_3R_364()) { jj_scanpos = xsp; break; }
         if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       }
       return false;
  @@ -6498,13 +6512,13 @@
       return false;
     }
   
  -  final private boolean jj_3R_375() {
  +  final private boolean jj_3R_376() {
       if (jj_3R_274()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_374() {
  +  final private boolean jj_3R_375() {
       if (jj_3R_273()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
  @@ -6516,7 +6530,7 @@
       return false;
     }
   
  -  final private boolean jj_3R_373() {
  +  final private boolean jj_3R_374() {
       if (jj_3R_271()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
  @@ -6528,22 +6542,28 @@
       return false;
     }
   
  -  final private boolean jj_3R_372() {
  +  final private boolean jj_3R_359() {
  +    if (jj_3R_260()) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    return false;
  +  }
  +
  +  final private boolean jj_3R_373() {
       if (jj_3R_270()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_359() {
  +  final private boolean jj_3R_360() {
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_372()) {
  -    jj_scanpos = xsp;
       if (jj_3R_373()) {
       jj_scanpos = xsp;
       if (jj_3R_374()) {
       jj_scanpos = xsp;
  -    if (jj_3R_375()) return true;
  +    if (jj_3R_375()) {
  +    jj_scanpos = xsp;
  +    if (jj_3R_376()) 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;
  @@ -6552,7 +6572,11 @@
     }
   
     final private boolean jj_3R_327() {
  -    if (jj_3R_359()) return true;
  +    Token xsp;
  +    xsp = jj_scanpos;
  +    if (jj_3R_359()) jj_scanpos = xsp;
  +    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    if (jj_3R_360()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
  @@ -7033,7 +7057,7 @@
       return false;
     }
   
  -  final private boolean jj_3R_371() {
  +  final private boolean jj_3R_372() {
       if (jj_scan_token(ASTERIX)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
  @@ -7058,7 +7082,7 @@
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_371()) jj_scanpos = xsp;
  +    if (jj_3R_372()) jj_scanpos = xsp;
       else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
  @@ -7189,7 +7213,7 @@
       return false;
     }
   
  -  final private boolean jj_3R_389() {
  +  final private boolean jj_3R_390() {
       if (jj_scan_token(FINALLY)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       if (jj_3R_73()) return true;
  @@ -7197,12 +7221,12 @@
       return false;
     }
   
  -  final private boolean jj_3R_388() {
  +  final private boolean jj_3R_389() {
       if (jj_scan_token(CATCH)) 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;
  -    if (jj_3R_360()) return true;
  +    if (jj_3R_361()) 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;
  @@ -7219,17 +7243,17 @@
       Token xsp;
       while (true) {
         xsp = jj_scanpos;
  -      if (jj_3R_388()) { jj_scanpos = xsp; break; }
  +      if (jj_3R_389()) { jj_scanpos = xsp; break; }
         if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       }
       xsp = jj_scanpos;
  -    if (jj_3R_389()) jj_scanpos = xsp;
  +    if (jj_3R_390()) jj_scanpos = xsp;
       else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_384() {
  -    if (jj_3R_395()) return true;
  +  final private boolean jj_3R_385() {
  +    if (jj_3R_396()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
  @@ -7248,13 +7272,13 @@
       return false;
     }
   
  -  final private boolean jj_3R_387() {
  +  final private boolean jj_3R_388() {
       if (jj_3R_63()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_386() {
  +  final private boolean jj_3R_387() {
       if (jj_scan_token(IDENTIFIER)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
  @@ -7270,7 +7294,7 @@
       return false;
     }
   
  -  final private boolean jj_3R_406() {
  +  final private boolean jj_3R_407() {
       if (jj_scan_token(COMMA)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       if (jj_3R_217()) return true;
  @@ -7283,14 +7307,14 @@
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_387()) jj_scanpos = xsp;
  +    if (jj_3R_388()) jj_scanpos = xsp;
       else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       if (jj_scan_token(SEMICOLON)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_385() {
  +  final private boolean jj_3R_386() {
       if (jj_scan_token(IDENTIFIER)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
  @@ -7301,14 +7325,14 @@
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_386()) jj_scanpos = xsp;
  +    if (jj_3R_387()) jj_scanpos = xsp;
       else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       if (jj_scan_token(SEMICOLON)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_383() {
  +  final private boolean jj_3R_384() {
       if (jj_3R_63()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
  @@ -7319,14 +7343,14 @@
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_385()) jj_scanpos = xsp;
  +    if (jj_3R_386()) jj_scanpos = xsp;
       else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       if (jj_scan_token(SEMICOLON)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_381() {
  +  final private boolean jj_3R_382() {
       if (jj_scan_token(ELSE)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       if (jj_3R_177()) return true;
  @@ -7334,8 +7358,8 @@
       return false;
     }
   
  -  final private boolean jj_3R_395() {
  -    if (jj_3R_405()) return true;
  +  final private boolean jj_3R_396() {
  +    if (jj_3R_406()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
  @@ -7358,42 +7382,42 @@
       return false;
     }
   
  -  final private boolean jj_3R_405() {
  +  final private boolean jj_3R_406() {
       if (jj_3R_217()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       Token xsp;
       while (true) {
         xsp = jj_scanpos;
  -      if (jj_3R_406()) { jj_scanpos = xsp; break; }
  +      if (jj_3R_407()) { jj_scanpos = xsp; break; }
         if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       }
       return false;
     }
   
  -  final private boolean jj_3R_382() {
  -    if (jj_3R_394()) return true;
  +  final private boolean jj_3R_383() {
  +    if (jj_3R_395()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_404() {
  -    if (jj_3R_405()) return true;
  +  final private boolean jj_3R_405() {
  +    if (jj_3R_406()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_403() {
  +  final private boolean jj_3R_404() {
       if (jj_3R_176()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_394() {
  +  final private boolean jj_3R_395() {
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_403()) {
  +    if (jj_3R_404()) {
       jj_scanpos = xsp;
  -    if (jj_3R_404()) return true;
  +    if (jj_3R_405()) 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;
  @@ -7406,17 +7430,17 @@
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_382()) jj_scanpos = xsp;
  +    if (jj_3R_383()) jj_scanpos = xsp;
       else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       if (jj_scan_token(SEMICOLON)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       xsp = jj_scanpos;
  -    if (jj_3R_383()) jj_scanpos = xsp;
  +    if (jj_3R_384()) jj_scanpos = xsp;
       else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       if (jj_scan_token(SEMICOLON)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       xsp = jj_scanpos;
  -    if (jj_3R_384()) jj_scanpos = xsp;
  +    if (jj_3R_385()) jj_scanpos = xsp;
       else 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;
  @@ -7457,7 +7481,7 @@
       return false;
     }
   
  -  final private boolean jj_3R_393() {
  +  final private boolean jj_3R_394() {
       if (jj_3R_160()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
  @@ -7476,12 +7500,12 @@
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_381()) jj_scanpos = xsp;
  +    if (jj_3R_382()) jj_scanpos = xsp;
       else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_402() {
  +  final private boolean jj_3R_403() {
       if (jj_scan_token(_DEFAULT)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       if (jj_scan_token(COLON)) return true;
  @@ -7489,7 +7513,7 @@
       return false;
     }
   
  -  final private boolean jj_3R_401() {
  +  final private boolean jj_3R_402() {
       if (jj_scan_token(CASE)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       if (jj_3R_63()) return true;
  @@ -7499,18 +7523,18 @@
       return false;
     }
   
  -  final private boolean jj_3R_392() {
  +  final private boolean jj_3R_393() {
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_401()) {
  +    if (jj_3R_402()) {
       jj_scanpos = xsp;
  -    if (jj_3R_402()) return true;
  +    if (jj_3R_403()) 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_379() {
  +  final private boolean jj_3R_380() {
       if (jj_scan_token(COMMA)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       if (jj_3R_299()) return true;
  @@ -7518,13 +7542,13 @@
       return false;
     }
   
  -  final private boolean jj_3R_380() {
  -    if (jj_3R_392()) return true;
  +  final private boolean jj_3R_381() {
  +    if (jj_3R_393()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       Token xsp;
       while (true) {
         xsp = jj_scanpos;
  -      if (jj_3R_393()) { jj_scanpos = xsp; break; }
  +      if (jj_3R_394()) { jj_scanpos = xsp; break; }
         if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       }
       return false;
  @@ -7544,7 +7568,7 @@
       Token xsp;
       while (true) {
         xsp = jj_scanpos;
  -      if (jj_3R_380()) { jj_scanpos = xsp; break; }
  +      if (jj_3R_381()) { jj_scanpos = xsp; break; }
         if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       }
       if (jj_scan_token(RBRACE)) return true;
  @@ -7552,7 +7576,7 @@
       return false;
     }
   
  -  final private boolean jj_3R_400() {
  +  final private boolean jj_3R_401() {
       if (jj_3R_183()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       if (jj_3R_63()) return true;
  @@ -7560,26 +7584,26 @@
       return false;
     }
   
  -  final private boolean jj_3R_399() {
  +  final private boolean jj_3R_400() {
       if (jj_scan_token(DECR)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_398() {
  +  final private boolean jj_3R_399() {
       if (jj_scan_token(INCR)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_391() {
  +  final private boolean jj_3R_392() {
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_398()) {
  -    jj_scanpos = xsp;
       if (jj_3R_399()) {
       jj_scanpos = xsp;
  -    if (jj_3R_400()) return true;
  +    if (jj_3R_400()) {
  +    jj_scanpos = xsp;
  +    if (jj_3R_401()) 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;
  @@ -7591,7 +7615,7 @@
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_391()) jj_scanpos = xsp;
  +    if (jj_3R_392()) jj_scanpos = xsp;
       else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
  @@ -7645,7 +7669,7 @@
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       while (true) {
         xsp = jj_scanpos;
  -      if (jj_3R_379()) { jj_scanpos = xsp; break; }
  +      if (jj_3R_380()) { jj_scanpos = xsp; break; }
         if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       }
       return false;
  @@ -8258,7 +8282,7 @@
       return false;
     }
   
  -  final private boolean jj_3R_397() {
  +  final private boolean jj_3R_398() {
       if (jj_scan_token(DECR)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
  @@ -8302,18 +8326,18 @@
       return false;
     }
   
  -  final private boolean jj_3R_396() {
  +  final private boolean jj_3R_397() {
       if (jj_scan_token(INCR)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_390() {
  +  final private boolean jj_3R_391() {
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_396()) {
  +    if (jj_3R_397()) {
       jj_scanpos = xsp;
  -    if (jj_3R_397()) return true;
  +    if (jj_3R_398()) 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;
  @@ -8383,7 +8407,7 @@
       return false;
     }
   
  -  final private boolean jj_3R_378() {
  +  final private boolean jj_3R_379() {
       if (jj_scan_token(LPAREN)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       if (jj_3R_66()) return true;
  @@ -8395,7 +8419,7 @@
       return false;
     }
   
  -  final private boolean jj_3R_377() {
  +  final private boolean jj_3R_378() {
       if (jj_scan_token(LPAREN)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       if (jj_3R_66()) return true;
  @@ -8407,12 +8431,12 @@
       return false;
     }
   
  -  final private boolean jj_3R_369() {
  +  final private boolean jj_3R_370() {
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_377()) {
  +    if (jj_3R_378()) {
       jj_scanpos = xsp;
  -    if (jj_3R_378()) return true;
  +    if (jj_3R_379()) 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;
  @@ -8428,12 +8452,12 @@
       return false;
     }
   
  -  final private boolean jj_3R_370() {
  +  final private boolean jj_3R_371() {
       if (jj_3R_56()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_390()) jj_scanpos = xsp;
  +    if (jj_3R_391()) jj_scanpos = xsp;
       else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
  @@ -8513,32 +8537,32 @@
       return false;
     }
   
  -  final private boolean jj_3R_368() {
  +  final private boolean jj_3R_369() {
       if (jj_scan_token(BANG)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
     final private boolean jj_3R_357() {
  -    if (jj_3R_370()) return true;
  +    if (jj_3R_371()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_366() {
  +  final private boolean jj_3R_367() {
       if (jj_scan_token(REM)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_367() {
  +  final private boolean jj_3R_368() {
       if (jj_scan_token(TILDE)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
     final private boolean jj_3R_356() {
  -    if (jj_3R_369()) return true;
  +    if (jj_3R_370()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
  @@ -8552,9 +8576,9 @@
     final private boolean jj_3R_355() {
       Token xsp;
       xsp = jj_scanpos;
  -    if (jj_3R_367()) {
  +    if (jj_3R_368()) {
       jj_scanpos = xsp;
  -    if (jj_3R_368()) return true;
  +    if (jj_3R_369()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       if (jj_3R_267()) return true;
  @@ -8576,7 +8600,7 @@
       return false;
     }
   
  -  final private boolean jj_3R_365() {
  +  final private boolean jj_3R_366() {
       if (jj_scan_token(SLASH)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
  @@ -8621,7 +8645,7 @@
       return false;
     }
   
  -  final private boolean jj_3R_364() {
  +  final private boolean jj_3R_365() {
       if (jj_scan_token(STAR)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
  @@ -8636,11 +8660,11 @@
     public boolean lookingAhead = false;
     private boolean jj_semLA;
     private int jj_gen;
  -  final private int[] jj_la1 = new int[120];
  -  final private int[] jj_la1_0 = 
{0x0,0x0,0x0,0x10081000,0x0,0x1000,0x10001000,0x10001000,0x4000000,0x0,0x510cb000,0x0,0x10001000,0x10001000,0x5104a000,0x10001000,0x10001000,0x1000,0x1000,0x10001000,0x10001000,0x4000000,0x510cb000,0x5104a000,0x10000000,0x10000000,0x0,0x0,0x0,0x4904a000,0x4904a000,0x0,0x10001000,0x10001000,0x0,0x0,0x0,0x0,0x5104a000,0x10000000,0x0,0x0,0x0,0xd9ace000,0x4904a000,0x0,0x4104a000,0x0,0x4104a000,0x4104a000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4904a000,0x0,0x0,0x4904a000,0x8000000,0x0,0x0,0x0,0x0,0x8000000,0x0,0x0,0x8000000,0x8000000,0x4904a000,0x0,0x0,0x0,0x0,0x0,0x0,0xc9a4e000,0xd9ace000,0xc9ace000,0x10000000,0x0,0x0,0x0,0x4904a000,0x410000,0xd9ace000,0x410000,0x2000000,0x5904a000,0x4904a000,0x4904a000,0x4904a000,0x0,0x0,0x0,0x4904a000,0x20000,0x20000000,0x0,0x0,0x0,0x0,0x0,0x0,};
  -  final private int[] jj_la1_1 = 
{0x800,0x8,0x0,0x40004040,0x0,0x40004040,0x40004000,0x40004000,0x0,0x4,0x591371e0,0x0,0x40027000,0x40027000,0x110370a0,0x40127100,0x40127100,0x40004000,0x40004000,0x40027000,0x40027000,0x0,0x591371e0,0x110370a0,0x11027000,0x11027000,0x0,0x0,0x0,0x8a2506a0,0x8a2506a0,0x0,0x40127100,0x40127100,0x800000,0x0,0x0,0x0,0x100a0,0x0,0x7000,0x7000,0x800000,0xae7d86e2,0x8a2506a0,0x20000,0x100a0,0x0,0x100a0,0x80100a0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8a2506a0,0x0,0x0,0x8a2506a0,0x82240600,0x0,0x0,0x0,0x0,0x82240600,0x0,0x0,0x82000400,0x2000000,0x8a2506a0,0x0,0x0,0x0,0x200,0x0,0x0,0xae7d86a2,0xae7d86e2,0xae7d86e2,0x0,0x0,0x0,0x0,0x8a2506a0,0x0,0xae7d86e2,0x0,0x0,0x8a2506a0,0x8a2506a0,0x8a2506a0,0x8a2506a0,0x0,0x0,0x0,0x8a2506a0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
  -  final private int[] jj_la1_2 = 
{0x0,0x0,0x0,0x10000,0x40000,0x10000,0x0,0x0,0x0,0x0,0x1080,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x80,0x0,0x0,0x20000,0x80000,0x4000,0xc014e8,0xc014e8,0x20000,0x0,0x0,0x0,0x11000,0x4000,0x20000,0x80,0x0,0x0,0x0,0x0,0x114e8,0x4e8,0x0,0x80,0x4000,0x0,0x80,0x20000,0x80000,0x80000,0x1000000,0x40000000,0x80000000,0x0,0x0,0x0,0x24000000,0x24000000,0x0,0x18300000,0x18300000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc004e8,0xc00000,0xc00000,0x4e8,0xc004e8,0x400,0x0,0x0,0x400,0x468,0x80,0x44400,0x68,0x0,0xc004e8,0x20000,0x1000,0x4400,0x0,0x4000,0x4000,0x114e8,0x114e8,0x114e8,0x0,0x20000,0x80000,0x80000,0x4e8,0x0,0x114e8,0x0,0x0,0x4e8,0xc004e8,0x4e8,0x4e8,0x20000,0x80,0x80,0xc004e8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
  -  final private int[] jj_la1_3 = 
{0x0,0x0,0x18000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18000000,0x18000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xf,0xf,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffe000,0xffe000,0x0,0x0,0x0,0x80,0x100,0x40,0x0,0x0,0x0,0x0,0x0,0x1c00,0x1c00,0xc,0xc,0x230,0x230,0xc,0xf,0x0,0x0,0x0,0x0,0x0,0x3,0x3,0x0,0x0,0x0,0x0,0x0,0x0,0xf,0x0,0x0,0x0,0x0,0x0,0x0,0x3,0x3,0x3,0x0,0x0,0xffe003,0xffe003,0x3,0x0,0x3,0x0,0x0,0x3,0xf,0x3,0x3,0x0,0x0,0x0,0xf,0x0,0x0,0x4000000,0x4000000,0x8000000,0x18000000,0x10000000,0x8000000,};
  +  final private int[] jj_la1 = new int[121];
  +  final private int[] jj_la1_0 = 
{0x0,0x0,0x10081000,0x0,0x0,0x1000,0x10001000,0x10001000,0x4000000,0x0,0x510cb000,0x0,0x10001000,0x10001000,0x5104a000,0x10001000,0x10001000,0x1000,0x1000,0x10001000,0x10001000,0x4000000,0x510cb000,0x0,0x5104a000,0x10000000,0x10000000,0x0,0x0,0x0,0x4904a000,0x4904a000,0x0,0x10001000,0x10001000,0x0,0x0,0x0,0x0,0x5104a000,0x10000000,0x0,0x0,0x0,0xd9ace000,0x4904a000,0x0,0x4104a000,0x0,0x4104a000,0x4104a000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4904a000,0x0,0x0,0x4904a000,0x8000000,0x0,0x0,0x0,0x0,0x8000000,0x0,0x0,0x8000000,0x8000000,0x4904a000,0x0,0x0,0x0,0x0,0x0,0x0,0xc9a4e000,0xd9ace000,0xc9ace000,0x10000000,0x0,0x0,0x0,0x4904a000,0x410000,0xd9ace000,0x410000,0x2000000,0x5904a000,0x4904a000,0x4904a000,0x4904a000,0x0,0x0,0x0,0x4904a000,0x20000,0x20000000,0x0,0x0,0x0,0x0,0x0,0x0,};
  +  final private int[] jj_la1_1 = 
{0x800,0x8,0x40004040,0x0,0x0,0x40004040,0x40004000,0x40004000,0x0,0x4,0x591371e0,0x0,0x40027000,0x40027000,0x110370a0,0x40127100,0x40127100,0x40004000,0x40004000,0x40027000,0x40027000,0x0,0x591371e0,0x0,0x110370a0,0x11027000,0x11027000,0x0,0x0,0x0,0x8a2506a0,0x8a2506a0,0x0,0x40127100,0x40127100,0x800000,0x0,0x0,0x0,0x100a0,0x0,0x7000,0x7000,0x800000,0xae7d86e2,0x8a2506a0,0x20000,0x100a0,0x0,0x100a0,0x80100a0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8a2506a0,0x0,0x0,0x8a2506a0,0x82240600,0x0,0x0,0x0,0x0,0x82240600,0x0,0x0,0x82000400,0x2000000,0x8a2506a0,0x0,0x0,0x0,0x200,0x0,0x0,0xae7d86a2,0xae7d86e2,0xae7d86e2,0x0,0x0,0x0,0x0,0x8a2506a0,0x0,0xae7d86e2,0x0,0x0,0x8a2506a0,0x8a2506a0,0x8a2506a0,0x8a2506a0,0x0,0x0,0x0,0x8a2506a0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
  +  final private int[] jj_la1_2 = 
{0x0,0x0,0x10000,0x0,0x40000,0x10000,0x0,0x0,0x0,0x0,0x1080,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x80,0x0,0x0,0x20000,0x80000,0x4000,0xc014e8,0xc014e8,0x20000,0x0,0x0,0x0,0x11000,0x4000,0x20000,0x80,0x0,0x0,0x0,0x0,0x114e8,0x4e8,0x0,0x80,0x4000,0x0,0x80,0x20000,0x80000,0x80000,0x1000000,0x40000000,0x80000000,0x0,0x0,0x0,0x24000000,0x24000000,0x0,0x18300000,0x18300000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc004e8,0xc00000,0xc00000,0x4e8,0xc004e8,0x400,0x0,0x0,0x400,0x468,0x80,0x44400,0x68,0x0,0xc004e8,0x20000,0x1000,0x4400,0x0,0x4000,0x4000,0x114e8,0x114e8,0x114e8,0x0,0x20000,0x80000,0x80000,0x4e8,0x0,0x114e8,0x0,0x0,0x4e8,0xc004e8,0x4e8,0x4e8,0x20000,0x80,0x80,0xc004e8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
  +  final private int[] jj_la1_3 = 
{0x0,0x0,0x18000000,0x18000000,0x0,0x0,0x0,0x0,0x0,0x0,0x18000000,0x18000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18000000,0x18000000,0x0,0x0,0x0,0x0,0x0,0x0,0xf,0xf,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffe000,0xffe000,0x0,0x0,0x0,0x80,0x100,0x40,0x0,0x0,0x0,0x0,0x0,0x1c00,0x1c00,0xc,0xc,0x230,0x230,0xc,0xf,0x0,0x0,0x0,0x0,0x0,0x3,0x3,0x0,0x0,0x0,0x0,0x0,0x0,0xf,0x0,0x0,0x0,0x0,0x0,0x0,0x3,0x3,0x3,0x0,0x0,0xffe003,0xffe003,0x3,0x0,0x3,0x0,0x0,0x3,0xf,0x3,0x3,0x0,0x0,0x0,0xf,0x0,0x0,0x4000000,0x4000000,0x8000000,0x18000000,0x10000000,0x8000000,};
     final private JJCalls[] jj_2_rtns = new JJCalls[29];
     private boolean jj_rescan = false;
     private int jj_gc = 0;
  @@ -8651,7 +8675,7 @@
       token = new Token();
       jj_ntk = -1;
       jj_gen = 0;
  -    for (int i = 0; i < 120; i++) jj_la1[i] = -1;
  +    for (int i = 0; i < 121; i++) jj_la1[i] = -1;
       for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
     }
   
  @@ -8662,7 +8686,7 @@
       jj_ntk = -1;
       jjtree.reset();
       jj_gen = 0;
  -    for (int i = 0; i < 120; i++) jj_la1[i] = -1;
  +    for (int i = 0; i < 121; i++) jj_la1[i] = -1;
       for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
     }
   
  @@ -8672,7 +8696,7 @@
       token = new Token();
       jj_ntk = -1;
       jj_gen = 0;
  -    for (int i = 0; i < 120; i++) jj_la1[i] = -1;
  +    for (int i = 0; i < 121; i++) jj_la1[i] = -1;
       for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
     }
   
  @@ -8683,7 +8707,7 @@
       jj_ntk = -1;
       jjtree.reset();
       jj_gen = 0;
  -    for (int i = 0; i < 120; i++) jj_la1[i] = -1;
  +    for (int i = 0; i < 121; i++) jj_la1[i] = -1;
       for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
     }
   
  @@ -8692,7 +8716,7 @@
       token = new Token();
       jj_ntk = -1;
       jj_gen = 0;
  -    for (int i = 0; i < 120; i++) jj_la1[i] = -1;
  +    for (int i = 0; i < 121; i++) jj_la1[i] = -1;
       for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
     }
   
  @@ -8702,7 +8726,7 @@
       jj_ntk = -1;
       jjtree.reset();
       jj_gen = 0;
  -    for (int i = 0; i < 120; i++) jj_la1[i] = -1;
  +    for (int i = 0; i < 121; i++) jj_la1[i] = -1;
       for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
     }
   
  @@ -8817,7 +8841,7 @@
         la1tokens[jj_kind] = true;
         jj_kind = -1;
       }
  -    for (int i = 0; i < 120; i++) {
  +    for (int i = 0; i < 121; i++) {
         if (jj_la1[i] == jj_gen) {
           for (int j = 0; j < 32; j++) {
             if ((jj_la1_0[i] & (1<<j)) != 0) {
  
  
  
  1.4       +7 -7      
jakarta-turbine-maven/src/java/org/apache/maven/java/parser/JavaParser.jj
  
  Index: JavaParser.jj
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/java/parser/JavaParser.jj,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JavaParser.jj     16 Apr 2002 18:14:50 -0000      1.3
  +++ JavaParser.jj     22 Apr 2002 02:00:21 -0000      1.4
  @@ -1,4 +1,4 @@
  -/*@bgen(jjtree) Generated By:JJTree: Do not edit this line. 
/home/jvanzyl/js/jakarta-turbine-maven/src/java/org/apache/maven/java/parser/JavaParser.jj
 */
  +/*@bgen(jjtree) Generated By:JJTree: Do not edit this line. 
/home/kaz/work/src/jakarta-turbine-maven/src/java/org/apache/maven/java/parser/JavaParser.jj
 */
   /*@egen*//**
    * This file is a modified version of one originally found in the
    * VTransformer Examples directory of JavaCC1_1. It has been 
  @@ -58,6 +58,7 @@
     protected JJTJavaParserState jjtree = new JJTJavaParserState();
   
   /*@egen*/
  +
       /** 
        * This constructor was added to allow the re-use of parsers.
        * The normal constructor takes a single argument which 
  @@ -380,8 +381,7 @@
   /*@egen*/
     [ PackageDeclaration() ]
     ( ImportDeclaration() )*
  -  [ JavaDocEntry() ]
  -  ( TypeDeclaration() )*
  +  ( [ JavaDocEntry() ] TypeDeclaration() )*
     <EOF>/*@bgen(jjtree)*/
     {
       jjtree.closeNodeScope(jjtn000, true);
  @@ -807,7 +807,7 @@
     try {
   /*@egen*/
     "interface" <IDENTIFIER> [ "extends" NameList() ]
  -  "{" ( InterfaceMemberDeclaration() )* "}"/*@bgen(jjtree)*/
  +  "{" ( [ JavaDocEntry() ] InterfaceMemberDeclaration() )* "}"/*@bgen(jjtree)*/
     } catch (Throwable jjte000) {
       if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
  @@ -3217,8 +3217,8 @@
   <IN_FORMAL_COMMENT>
   SKIP:
   {
  -    <JAVADOC_START: "/**" >
  -|   <JAVADOC_END: "*/" > : DEFAULT
  +    <JAVADOC_START: "/**" (<ASTERIX>)* >
  +|   <JAVADOC_END: (<ASTERIX>)* "*/" > : DEFAULT
   }
   
   <IN_FORMAL_COMMENT>
  @@ -3258,7 +3258,7 @@
           jjtree.closeNodeScope(jjtn000, true);
         }
       }
  -/*@egen*/ 
  +/*@egen*/
   }
   
   void JavaDocText():
  
  
  
  1.4       +2 -2      
jakarta-turbine-maven/src/java/org/apache/maven/java/parser/JavaParserConstants.java
  
  Index: JavaParserConstants.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/java/parser/JavaParserConstants.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JavaParserConstants.java  16 Apr 2002 18:14:50 -0000      1.3
  +++ JavaParserConstants.java  22 Apr 2002 02:00:21 -0000      1.4
  @@ -246,8 +246,8 @@
       "\"<<=\"",
       "\">>=\"",
       "\">>>=\"",
  -    "\"/**\"",
  -    "\"*/\"",
  +    "<JAVADOC_START>",
  +    "<JAVADOC_END>",
       "\"@\"",
       "\"*\"",
       "<TEXT>",
  
  
  
  1.4       +58 -57    
jakarta-turbine-maven/src/java/org/apache/maven/java/parser/JavaParserTokenManager.java
  
  Index: JavaParserTokenManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/java/parser/JavaParserTokenManager.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JavaParserTokenManager.java       16 Apr 2002 18:14:50 -0000      1.3
  +++ JavaParserTokenManager.java       22 Apr 2002 02:00:21 -0000      1.4
  @@ -1368,10 +1368,6 @@
   {
      switch (pos)
      {
  -      case 0:
  -         if ((active1 & 0x100000000000000L) != 0L)
  -            return 0;
  -         return -1;
         default :
            return -1;
      }
  @@ -1393,61 +1389,18 @@
      switch(curChar)
      {
         case 42:
  -         jjmatchedKind = 123;
  -         return jjMoveStringLiteralDfa1_3(0x200000000000000L);
  -      case 47:
  -         return jjMoveStringLiteralDfa1_3(0x100000000000000L);
  +         return jjStartNfaWithStates_3(0, 123, 5);
         case 64:
            return jjStopAtPos(0, 122);
         default :
  -         return jjMoveNfa_3(0, 0);
  -   }
  -}
  -private final int jjMoveStringLiteralDfa1_3(long active1)
  -{
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_3(0, 0L, active1);
  -      return 1;
  -   }
  -   switch(curChar)
  -   {
  -      case 42:
  -         return jjMoveStringLiteralDfa2_3(active1, 0x100000000000000L);
  -      case 47:
  -         if ((active1 & 0x200000000000000L) != 0L)
  -            return jjStopAtPos(1, 121);
  -         break;
  -      default :
  -         break;
  +         return jjMoveNfa_3(3, 0);
      }
  -   return jjStartNfa_3(0, 0L, active1);
  -}
  -private final int jjMoveStringLiteralDfa2_3(long old1, long active1)
  -{
  -   if (((active1 &= old1)) == 0L)
  -      return jjStartNfa_3(0, 0L, old1); 
  -   try { curChar = input_stream.readChar(); }
  -   catch(java.io.IOException e) {
  -      jjStopStringLiteralDfa_3(1, 0L, active1);
  -      return 2;
  -   }
  -   switch(curChar)
  -   {
  -      case 42:
  -         if ((active1 & 0x100000000000000L) != 0L)
  -            return jjStopAtPos(2, 120);
  -         break;
  -      default :
  -         break;
  -   }
  -   return jjStartNfa_3(1, 0L, active1);
   }
   private final int jjMoveNfa_3(int startState, int curPos)
   {
      int[] nextStates;
      int startsAt = 0;
  -   jjnewStateCnt = 1;
  +   jjnewStateCnt = 8;
      int i = 1;
      jjstateSet[0] = startState;
      int j, kind = 0x7fffffff;
  @@ -1462,11 +1415,57 @@
            {
               switch(jjstateSet[--i])
               {
  +               case 3:
  +                  if ((0xfffffbffffffffffL & l) != 0L)
  +                  {
  +                     if (kind > 124)
  +                        kind = 124;
  +                     jjCheckNAdd(7);
  +                  }
  +                  else if (curChar == 42)
  +                     jjstateSet[jjnewStateCnt++] = 5;
  +                  if (curChar == 42)
  +                     jjCheckNAddTwoStates(4, 6);
  +                  else if (curChar == 47)
  +                     jjstateSet[jjnewStateCnt++] = 2;
  +                  break;
  +               case 5:
  +                  if (curChar == 47)
  +                  {
  +                     if (kind > 121)
  +                        kind = 121;
  +                  }
  +                  else if (curChar == 42)
  +                     jjstateSet[jjnewStateCnt++] = 5;
  +                  if (curChar == 42)
  +                     jjCheckNAddTwoStates(4, 6);
  +                  break;
                  case 0:
  +               case 1:
  +                  if (curChar != 42)
  +                     break;
  +                  if (kind > 120)
  +                     kind = 120;
  +                  jjCheckNAdd(1);
  +                  break;
  +               case 2:
  +                  if (curChar == 42)
  +                     jjstateSet[jjnewStateCnt++] = 0;
  +                  break;
  +               case 4:
  +                  if (curChar == 42)
  +                     jjCheckNAddTwoStates(4, 6);
  +                  break;
  +               case 6:
  +                  if (curChar == 42)
  +                     jjstateSet[jjnewStateCnt++] = 5;
  +                  break;
  +               case 7:
                     if ((0xfffffbffffffffffL & l) == 0L)
                        break;
  -                  kind = 124;
  -                  jjstateSet[jjnewStateCnt++] = 0;
  +                  if (kind > 124)
  +                     kind = 124;
  +                  jjCheckNAdd(7);
                     break;
                  default : break;
               }
  @@ -1479,11 +1478,12 @@
            {
               switch(jjstateSet[--i])
               {
  -               case 0:
  +               case 3:
  +               case 7:
                     if ((0xfffffffffffffffeL & l) == 0L)
                        break;
                     kind = 124;
  -                  jjstateSet[jjnewStateCnt++] = 0;
  +                  jjCheckNAdd(7);
                     break;
                  default : break;
               }
  @@ -1500,12 +1500,13 @@
            {
               switch(jjstateSet[--i])
               {
  -               case 0:
  +               case 3:
  +               case 7:
                     if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
                        break;
                     if (kind > 124)
                        kind = 124;
  -                  jjstateSet[jjnewStateCnt++] = 0;
  +                  jjCheckNAdd(7);
                     break;
                  default : break;
               }
  @@ -1518,7 +1519,7 @@
            kind = 0x7fffffff;
         }
         ++curPos;
  -      if ((i = jjnewStateCnt) == (startsAt = 1 - (jjnewStateCnt = startsAt)))
  +      if ((i = jjnewStateCnt) == (startsAt = 8 - (jjnewStateCnt = startsAt)))
            return curPos;
         try { curChar = input_stream.readChar(); }
         catch(java.io.IOException e) { return curPos; }
  
  
  
  1.3       +1 -1      
jakarta-turbine-maven/src/java/org/apache/maven/java/parser/JavaParserTreeConstants.java
  
  Index: JavaParserTreeConstants.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/java/parser/JavaParserTreeConstants.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JavaParserTreeConstants.java      3 Mar 2002 15:32:26 -0000       1.2
  +++ JavaParserTreeConstants.java      22 Apr 2002 02:00:21 -0000      1.3
  @@ -1,4 +1,4 @@
  -/* Generated By:JJTree: Do not edit this line. 
/home/jvanzyl/js/jakarta-turbine-maven/src/java/org/apache/maven/java/parser/JavaParserTreeConstants.java
 */
  +/* Generated By:JJTree: Do not edit this line. 
/home/kaz/work/src/jakarta-turbine-maven/src/java/org/apache/maven/java/parser/JavaParserTreeConstants.java
 */
   
   package org.apache.maven.java.parser;
   
  
  
  
  1.3       +1 -1      
jakarta-turbine-maven/src/java/org/apache/maven/java/parser/JavaParserVisitor.java
  
  Index: JavaParserVisitor.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/java/parser/JavaParserVisitor.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JavaParserVisitor.java    3 Mar 2002 15:32:26 -0000       1.2
  +++ JavaParserVisitor.java    22 Apr 2002 02:00:21 -0000      1.3
  @@ -1,4 +1,4 @@
  -/* Generated By:JJTree: Do not edit this line. 
/home/jvanzyl/js/jakarta-turbine-maven/src/java/org/apache/maven/java/parser/JavaParserVisitor.java
 */
  +/* Generated By:JJTree: Do not edit this line. 
/home/kaz/work/src/jakarta-turbine-maven/src/java/org/apache/maven/java/parser/JavaParserVisitor.java
 */
   
   package org.apache.maven.java.parser;
   
  
  
  


Reply via email to