The second code snippet in this message is just the WebMacro code cut
and pasted again--it should be the correct Velocity equivalent. I
attempted to change the commit message via `cvs admin`, but got the
following error:
cvs [server aborted]: usage is restricted to members of the group cvsadmin
I am apparently not in the cvsadmin unix group. Suck. ;p
[EMAIL PROTECTED] writes:
> dlr 01/06/20 19:32:48
>
> Modified: src/java/org/apache/velocity/convert WebMacro.java
> Log:
> Fixed conversion issue covered by last test case for multi-arg method
> call for the RHS in a #set.
>
> #set $entries = $host.getAuditLog($acl, $itemsPerPage, $filter)
>
> is now correctly converted to
>
> #set $entries = $host.getAuditLog($acl, $itemsPerPage, $filter)
>
> instead of
>
> #set( $entries = $host.getAuditLog($acl, )$itemsPerPage, $filter)
>
> WHOOT!
>
> Revision Changes Path
> 1.17 +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.16
> retrieving revision 1.17
> diff -u -r1.16 -r1.17
> --- WebMacro.java 2001/05/22 02:40:39 1.16
> +++ WebMacro.java 2001/06/21 02:32:46 1.17
> @@ -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.16 2001/05/22 02:40:39 dlr Exp $
> + * @version $Id: WebMacro.java,v 1.17 2001/06/21 02:32:46 dlr Exp $
> */
> public class WebMacro
> {
> @@ -102,7 +102,7 @@
> "#foreach( $1 in $2 )",
>
> // Convert WM style #set to Velocity directive style.
> - "#set\\s+(\\$[^\\s=]+)\\s*=\\s*([\\S]+)[ \\t]*",
> + "#set\\s+(\\$[^\\s=]+)\\s*=\\s*([\\S \\t]+)",
> "#set( $1 = $2 )",
> "(##[# \\t\\w]*)\\)", // fix comments included at end of line
> ")$1",
>
>
>
