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

[geirm]

geirm       01/02/07 09:27:08

  Modified:    src/java/org/apache/velocity/runtime/parser Parser.jjt
  Log:
  Fix for object array with single reference.  Parser was getting confused between OA 
and IR.  Reported by Christoph.  Thanks!
  
  Revision  Changes    Path
  1.55      +3 -3      
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.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- Parser.jjt        2001/01/29 06:05:02     1.54
  +++ Parser.jjt        2001/02/07 17:27:07     1.55
  @@ -120,7 +120,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.54 2001/01/29 06:05:02 geirm Exp $ 
  + * @version $Id: Parser.jjt,v 1.55 2001/02/07 17:27:07 geirm Exp $ 
   */
   public class Parser
   {
  @@ -1407,8 +1407,8 @@
       StringLiteral()
     | NumberLiteral()    
     | Reference()
  -  | LOOKAHEAD(4) IntegerRange()
  -  | ObjectArray()
  +  | LOOKAHEAD(3) ObjectArray()
  +  | IntegerRange()
     | True()
     | False()
     | <LPAREN>  Expression()  <RPAREN>