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

[geirm]

geirm       01/07/17 20:50:20

  Modified:    src/java/org/apache/velocity/runtime/parser Parser.jjt
  Log:
  Minor bugfix to solve problems I created with last fix to OA/IR stuff.
  
  Thanks to Dan Finkelstein <[EMAIL PROTECTED]> for finding them
  and creating a complete and useful bug report.  (Kudos also for testing
  the separate instance Velocity as well...)
  
  Revision  Changes    Path
  1.64      +4 -4      
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.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- Parser.jjt        2001/07/14 13:22:40     1.63
  +++ Parser.jjt        2001/07/18 03:50:19     1.64
  @@ -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.63 2001/07/14 13:22:40 geirm Exp $ 
  + * @version $Id: Parser.jjt,v 1.64 2001/07/18 03:50:19 geirm Exp $ 
   */
   public class Parser
   {
  @@ -1153,7 +1153,7 @@
   |   Word()  
   |   StringLiteral()
   |   NumberLiteral()
  -|   LOOKAHEAD(5) IntegerRange()
  +|   LOOKAHEAD(  <LBRACKET> [<WHITESPACE>] ( Reference() | NumberLiteral()) 
[<WHITESPACE>] <DOUBLEDOT> ) IntegerRange()
   |   ObjectArray()
   |   True()
   |   False()
  @@ -1291,7 +1291,7 @@
       [<WHITESPACE>]
       (
           StringLiteral()
  -      | LOOKAHEAD(5) IntegerRange()
  +      | LOOKAHEAD(  <LBRACKET> [<WHITESPACE>] ( Reference() | NumberLiteral()) 
[<WHITESPACE>] <DOUBLEDOT> ) IntegerRange()
         | ObjectArray()
         | True()
         | False()
  @@ -1490,7 +1490,7 @@
       StringLiteral()
     | NumberLiteral()    
     | Reference()
  -  | LOOKAHEAD(5) IntegerRange()
  +  | LOOKAHEAD(  <LBRACKET> [<WHITESPACE>] ( Reference() | NumberLiteral()) 
[<WHITESPACE>] <DOUBLEDOT> ) IntegerRange()
     | ObjectArray()
     | True()
     | False()