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

[dlr]

dlr         01/05/11 19:14:41

  Modified:    src/java/org/apache/velocity/convert WebMacro.java
  Log:
  Removed regex from data set which is now executed in during a separate
  pass (moved by last commit).
  
  Revision  Changes    Path
  1.15      +1 -8      
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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- WebMacro.java     2001/05/12 02:04:25     1.14
  +++ WebMacro.java     2001/05/12 02:14:41     1.15
  @@ -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.14 2001/05/12 02:04:25 dlr Exp $ 
  + * @version $Id: WebMacro.java,v 1.15 2001/05/12 02:14:41 dlr Exp $ 
    */
   public class WebMacro
   {
  @@ -100,13 +100,6 @@
           // Convert WM style #foreach to Velocity directive style.
           "#foreach\\s+(\\$\\w+)\\s+in\\s+(\\$[^\\s#]+)\\s*(#begin|{)[ \\t]?",
           "#foreach( $1 in $2 )",
  -
  -        // Change the "}" to #end. Have to get more
  -        // sophisticated here. Will assume either {}
  -        // and no javascript, or #begin/#end with the
  -        // possibility of javascript.
  -        "\n}", // assumes that javascript is indented, WMs not!!!
  -        "\n#end",
   
           // Convert WM style #set to Velocity directive style.
           "#set\\s+(\\$[^\\s=]+)\\s*=\\s*([\\S]+)[ \\t]*",