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

[geirm]

geirm       01/01/28 22:05:07

  Modified:    src/java/org/apache/velocity/runtime/parser Parser.jjt
  Log:
  Removed support for the deprecated #set syntax :
  
  #set $foo = $bar
  
  and we now only support the normalized #set :
  
  #set( $foo = $bar )
  
  Revision  Changes    Path
  1.54      +3 -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.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- Parser.jjt        2001/01/29 04:27:11     1.53
  +++ Parser.jjt        2001/01/29 06:05:02     1.54
  @@ -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.53 2001/01/29 04:27:11 geirm Exp $ 
  + * @version $Id: Parser.jjt,v 1.54 2001/01/29 06:05:02 geirm Exp $ 
   */
   public class Parser
   {
  @@ -1302,8 +1302,7 @@
   {
       <SET_DIRECTIVE>  
       [ LOOKAHEAD(2) <WHITESPACE> ] 
  -    ( LOOKAHEAD(2) ( <LPAREN> Expression() <RPAREN> ) | ( Expression() [<NEWLINE>]) 
)
  -
  +    ( <LPAREN> Expression() <RPAREN>
       { 
           /*
            * ensure that inSet is false.  Leads to some amusing bugs...
  @@ -1311,6 +1310,7 @@
       
           token_source.inSet = false; 
       }
  +    [<NEWLINE>] )
   }    
   
   /**