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

[geirm]

geirm       00/12/06 11:49:25

  Modified:    src/java/org/apache/velocity/runtime/parser Parser.jjt
  Log:
  Fixed the #else bug found by Christoph Reck that the newlines after #else don't get 
eaten.  Remarkably, we didn't ever test else apparently in the testbed :)
  
  Revision  Changes    Path
  1.38      +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.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- Parser.jjt        2000/12/06 05:57:18     1.37
  +++ Parser.jjt        2000/12/06 19:49:23     1.38
  @@ -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.37 2000/12/06 05:57:18 geirm Exp $ 
  + * @version $Id: Parser.jjt,v 1.38 2000/12/06 19:49:23 geirm Exp $ 
   */
   public class Parser
   {
  @@ -789,7 +789,7 @@
           SwitchTo(DIRECTIVE);
       }
   
  -|   <ELSE_DIRECTIVE: "else"> 
  +|   <ELSE_DIRECTIVE: "else" ( ( " " | "\t" )* ( "\n" | "\r" | "\r\n" ) )?  > 
        { 
           inDirective = false; 
           stateStackPop();