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

[geirm]

geirm       00/12/20 19:53:22

  Modified:    src/java/org/apache/velocity/runtime/parser Parser.jjt
  Log:
  Fixed the logical_not bug that produced a parser exception if it was preceeded by 
whitespace :  #if( !$foo ) blew up.
  Should be just fine now.
  
  Revision  Changes    Path
  1.44      +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.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- Parser.jjt        2000/12/19 13:34:40     1.43
  +++ Parser.jjt        2000/12/21 03:53:21     1.44
  @@ -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.43 2000/12/19 13:34:40 geirm Exp $ 
  + * @version $Id: Parser.jjt,v 1.44 2000/12/21 03:53:21 geirm Exp $ 
   */
   public class Parser
   {
  @@ -1382,7 +1382,7 @@
   
   void UnaryExpression() #void : {}
   {
  -    <LOGICAL_NOT>  UnaryExpression() #NotNode(1)
  +     LOOKAHEAD(2)  [<WHITESPACE>]  <LOGICAL_NOT>  UnaryExpression() #NotNode(1)
   |   PrimaryExpression() 
   }