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

[geirm]

geirm       01/06/29 16:31:38

  Modified:    src/java/org/apache/velocity/runtime/parser Parser.jjt
  Log:
  Fix to allow things like
  
   #foo( [ $a ] )
  
  as pointed out by bug report by Charles Anthony
   <[EMAIL PROTECTED]>
  
  Also extended the syntax to allow both ObjectArray and IntegerRange as
  args to methods.
  
  $foo.bar( [1..2])  or $foo.bar( [$a,$b])
  
  Revision  Changes    Path
  1.62      +7 -6      
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/Parser.jjt
  
  Index: Parser.jjt
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/Parser.jjt,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- Parser.jjt        2001/06/12 03:18:05     1.61
  +++ Parser.jjt        2001/06/29 23:31:37     1.62
  @@ -136,7 +136,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Geir Magnusson Jr.</a>
  - * @version $Id: Parser.jjt,v 1.61 2001/06/12 03:18:05 geirm Exp $ 
  + * @version $Id: Parser.jjt,v 1.62 2001/06/29 23:31:37 geirm Exp $ 
   */
   public class Parser
   {
  @@ -480,7 +480,7 @@
   |   <COMMA:",">
   }
   
  -<DIRECTIVE>
  +<DIRECTIVE, REFMOD2>
   TOKEN:
   {
     <DOUBLEDOT : ".." >
  @@ -1149,7 +1149,7 @@
   |   Word()  
   |   StringLiteral()
   |   NumberLiteral()
  -|   LOOKAHEAD(4) IntegerRange()
  +|   LOOKAHEAD(5) IntegerRange()
   |   ObjectArray()
   |   True()
   |   False()
  @@ -1287,13 +1287,14 @@
       [<WHITESPACE>]
       (
           StringLiteral()
  +      | LOOKAHEAD(5) IntegerRange()
         | ObjectArray()
         | True()
         | False()
         | Reference()
         | NumberLiteral()
       )
  -    [<WHITESPACE>]
  +    [ <WHITESPACE>]
   }
   
   /**
  @@ -1485,8 +1486,8 @@
       StringLiteral()
     | NumberLiteral()    
     | Reference()
  -  | LOOKAHEAD(3) ObjectArray()
  -  | IntegerRange()
  +  | LOOKAHEAD(5) IntegerRange()
  +  | ObjectArray()
     | True()
     | False()
     | <LPAREN>  Expression()  <RPAREN>