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

[geirm]

geirm       00/11/05 08:28:19

  Modified:    src/java/org/apache/velocity/runtime/parser Parser.jjt
  Log:
  Changed the binding of <whitespace><newline> for the end of directive statements to 
allow for leading whitespace in an inline block.  Ex #foreach($a in $array) $a#end 
will have a ' ' before each rendered $a. Previously, they were being sucked into the 
directive node to allow 'what you expect' behavior when you do a conventional 
#foreach() block.
  
  Revision  Changes    Path
  1.21      +2 -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.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- Parser.jjt        2000/11/05 05:46:18     1.20
  +++ Parser.jjt        2000/11/05 16:28:18     1.21
  @@ -127,7 +127,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.20 2000/11/05 05:46:18 geirm Exp $ 
  + * @version $Id: Parser.jjt,v 1.21 2000/11/05 16:28:18 geirm Exp $ 
   */
   public class Parser
   {
  @@ -482,7 +482,7 @@
   <DIRECTIVE>
   TOKEN:
   {
  -   <RPAREN: ")" (" ")* ( "\n" | "\r" | "\r\n" )?>
  +   <RPAREN: ")" ((" ")* ( "\n" | "\r" | "\r\n" ))?>
       {
          RPARENHandler();
       }