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

[geirm]

geirm       00/12/27 15:48:41

  Modified:    src/java/org/apache/velocity/runtime/parser Parser.jjt
  Log:
  Small fix for the bug reported by jon re :
  [$foo.bar] wouldn't parse right because the ] was incorrectly listed as a valid char
  for REFMOD state, and not a valid identifier character.
  
  Revision  Changes    Path
  1.49      +8 -2      
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.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- Parser.jjt        2000/12/27 14:48:09     1.48
  +++ Parser.jjt        2000/12/27 23:48:41     1.49
  @@ -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.48 2000/12/27 14:48:09 geirm Exp $ 
  + * @version $Id: Parser.jjt,v 1.49 2000/12/27 23:48:41 geirm Exp $ 
   */
   public class Parser
   {
  @@ -438,11 +438,17 @@
    *
    * ------------------------------------------------------------------------- */
   
  -<DIRECTIVE,REFMODIFIER,REFMOD2>
  +<DIRECTIVE,REFMOD2>
   TOKEN:
   { 
       <LBRACKET: "[">
   |   <RBRACKET: "]">
  +}
  +
  +<DIRECTIVE>
  +TOKEN:
  +{
  +  <DOUBLEDOT : ".." >
   }
   
   <DIRECTIVE,REFMOD2>