cvs commit: jakarta-velocity/src/java/org/apache/velocity/convert WebMacro.java

[dlr]

dlr         01/05/21 19:40:40

  Modified:    src/java/org/apache/velocity/convert WebMacro.java
  Log:
  More WM statement terminator handling to vanquish the dreaded semi-colon!
  
  Revision  Changes    Path
  1.16      +6 -2      
jakarta-velocity/src/java/org/apache/velocity/convert/WebMacro.java
  
  Index: WebMacro.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/convert/WebMacro.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- WebMacro.java     2001/05/12 02:14:41     1.15
  +++ WebMacro.java     2001/05/22 02:40:39     1.16
  @@ -71,7 +71,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
  - * @version $Id: WebMacro.java,v 1.15 2001/05/12 02:14:41 dlr Exp $ 
  + * @version $Id: WebMacro.java,v 1.16 2001/05/22 02:40:39 dlr Exp $ 
    */
   public class WebMacro
   {
  @@ -127,8 +127,12 @@
           "\\${(_[^}]+)}", // within a formal reference
           "${l$1}",
   
  +        // Eat semi-colons in (converted) VTL #set directives.
  +        "(#set\\s*\\([^;]+);(\\s*\\))",
  +        "$1$2",
  +
           // Convert explicitly terminated WM statements to VTL syntax.
  -        "(^|[^\\\\])\\$([\\w]+);",
  +        "(^|[^\\\\])\\$(\\w[^=\n;]*);",
           "$1${$2}",
   
           // Change extensions when seen.