cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime/parser Parser.java Parser.jj

[geirm]

geirm       00/11/21 18:17:43

  Modified:    src/java/org/apache/velocity/runtime/parser Parser.java
                        Parser.jj
  Log:
  Usual Parser.jjt followers.
  
  Revision  Changes    Path
  1.34      +2 -2      
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/Parser.java
  
  Index: Parser.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/Parser.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- Parser.java       2000/11/21 02:30:00     1.33
  +++ Parser.java       2000/11/22 02:17:42     1.34
  @@ -21,7 +21,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
  - * @version $Id: Parser.java,v 1.33 2000/11/21 02:30:00 geirm Exp $ 
  + * @version $Id: Parser.java,v 1.34 2000/11/22 02:17:42 geirm Exp $ 
   */
   public class Parser/*@bgen(jjtree)*/implements ParserTreeConstants, ParserConstants 
{/*@bgen(jjtree)*/
     protected JJTParserState jjtree = new JJTParserState();/**
  @@ -564,7 +564,6 @@
         jj_consume_token(LPAREN);
         label_3:
         while (true) {
  -        DirectiveArg();
           switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
           case LBRACKET:
           case WHITESPACE:
  @@ -579,6 +578,7 @@
             jj_la1[5] = jj_gen;
             break label_3;
           }
  +        DirectiveArg();
         }
         jj_consume_token(RPAREN);
           if (d.getType() == Directive.LINE)
  
  
  
  1.32      +2 -2      
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/Parser.jj
  
  Index: Parser.jj
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/Parser.jj,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- Parser.jj 2000/11/21 02:30:00     1.31
  +++ Parser.jj 2000/11/22 02:17:42     1.32
  @@ -106,7 +106,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
  - * @version $Id: Parser.jj,v 1.31 2000/11/21 02:30:00 geirm Exp $ 
  + * @version $Id: Parser.jj,v 1.32 2000/11/22 02:17:42 geirm Exp $ 
   */
   public class Parser/*@bgen(jjtree)*/implements ParserTreeConstants/*@egen*/
   {/*@bgen(jjtree)*/
  @@ -1278,7 +1278,7 @@
        *  if this is indeed a token, match the #foo ( arg ) pattern
        */
   
  -    [<WHITESPACE>] <LPAREN> (  DirectiveArg()  )+ <RPAREN>
  +    [<WHITESPACE>] <LPAREN> (  DirectiveArg()  )* <RPAREN>
       {
           if (d.getType() == Directive.LINE)
               return jjtn000;