dlr 01/06/20 19:54:55
Modified: convert Tag: VEL_1_1_BRANCH convert.wm
src/java/org/apache/velocity/convert Tag: VEL_1_1_BRANCH
WebMacro.java
Log:
Backported recent conversion program fixes and enhancements from the HEAD.
Revision Changes Path
No revision
No revision
1.4.2.1 +5 -0 jakarta-velocity/convert/convert.wm
Index: convert.wm
===================================================================
RCS file: /home/cvs/jakarta-velocity/convert/convert.wm,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- convert.wm 2001/05/12 01:40:51 1.4
+++ convert.wm 2001/06/21 02:54:53 1.4.2.1
@@ -28,7 +28,12 @@
}
}
+ #set $action= $permission.getAction();
+ $resource.getDescription();: $resource.getPattern();
+
$_leadingUnderscore
+
+#set $entries = $host.getAuditLog($acl, $itemsPerPage, $filter)
This is an explicitly terminated $statement;.
No revision
No revision
1.15.2.1 +7 -3
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.15.2.1
diff -u -r1.15 -r1.15.2.1
--- WebMacro.java 2001/05/12 02:14:41 1.15
+++ WebMacro.java 2001/06/21 02:54:54 1.15.2.1
@@ -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.15.2.1 2001/06/21 02:54:54 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",
@@ -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.
