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

[geirm]

geirm       00/12/07 19:17:31

  Modified:    src/java/org/apache/velocity/runtime/parser Parser.jjt
  Log:
  New parser that supports the inline #set :  #set( expr )
  
  Revision  Changes    Path
  1.39      +9 -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.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- Parser.jjt        2000/12/06 19:49:23     1.38
  +++ Parser.jjt        2000/12/08 03:17:31     1.39
  @@ -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.38 2000/12/06 19:49:23 geirm Exp $ 
  + * @version $Id: Parser.jjt,v 1.39 2000/12/08 03:17:31 geirm Exp $ 
   */
   public class Parser
   {
  @@ -1275,11 +1275,17 @@
       ( Statement() )+ #Block
   }
   
  +/**
  + *  Currently support both types of set :
  + *   #set( expr )
  + *   #set expr
  + */
   void SetDirective() : {}
   {
  -   (  <SET_DIRECTIVE>  Expression()  [<NEWLINE>] )
  +    <SET_DIRECTIVE>  
  +    [ LOOKAHEAD(2) <WHITESPACE> ] 
  +    ( LOOKAHEAD(2) ( <LPAREN> Expression() <RPAREN> ) | ( Expression() [<NEWLINE>]) 
)
   }    
  -
   
   /**
    * This method corresponds to the #stop