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

[dlr]

dlr         01/06/21 16:38:56

  Modified:    convert  convert.wm
               src/java/org/apache/velocity/convert WebMacro.java
  Log:
  Added test case demonstrating and fix for explictly terminated WebMacro statement 
conversion to formal VTL reference.
  
  Revision  Changes    Path
  1.7       +2 -0      jakarta-velocity/convert/convert.wm
  
  Index: convert.wm
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity/convert/convert.wm,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- convert.wm        2001/06/21 01:51:14     1.6
  +++ convert.wm        2001/06/21 23:38:54     1.7
  @@ -1,5 +1,7 @@
   ## This is a template to convert.
   
  +<input type="submit" name="Button" value="$prevStep">&nbsp;
  +
   #foreach $this in $that
   #begin
       This is the text
  
  
  
  1.18      +2 -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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- WebMacro.java     2001/06/21 02:32:46     1.17
  +++ WebMacro.java     2001/06/21 23:38:55     1.18
  @@ -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.17 2001/06/21 02:32:46 dlr Exp $ 
  + * @version $Id: WebMacro.java,v 1.18 2001/06/21 23:38:55 dlr Exp $ 
    */
   public class WebMacro
   {
  @@ -132,7 +132,7 @@
           "$1$2",
   
           // Convert explicitly terminated WM statements to VTL syntax.
  -        "(^|[^\\\\])\\$(\\w[^=\n;]*);",
  +        "(^|[^\\\\])\\$(\\w[^=\n;'\"]*);",
           "$1${$2}",
   
           // Change extensions when seen.