geirm 00/10/31 11:17:05
Modified: src/java/org/apache/velocity/runtime/parser/node
ASTSetDirective.java
Log:
Fixed so in-template creation of an array for a #foreach works, as in :
#set $a = ["a","b"]
#foreach( $i in $a)
$i
#end
Revision Changes Path
1.4 +113 -0
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java
Index: ASTSetDirective.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ASTSetDirective.java 2000/10/21 01:59:22 1.3
+++ ASTSetDirective.java 2000/10/31 19:17:03 1.4
@@ -1,5 +1,67 @@
/* Generated By:JJTree: Do not edit this line. ASTSetDirective.java */
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * Foundation" must not be used to endorse or promote products derived
+ * from this software without prior written permission. For written
+ * permission, please contact [EMAIL PROTECTED]
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+/**
+ * Node for the #set directive
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
+ * @version $Id: ASTSetDirective.java,v 1.4 2000/10/31 19:17:03 geirm Exp $
+ */
+
package org.apache.velocity.runtime.parser.node;
import java.io.IOException;
@@ -32,6 +94,57 @@
{
return visitor.visit(this, data);
}
+
+ /**
+ * This specfically addresses a special case :
+ *
+ * #set $foo = [ "a","b"]
+ * #foreach( $i in $foo)
+ * $i
+ * #end
+ *
+ * Otherwise, the rest is done in render()
+ *
+ * We may want to revisit this. This is due to Foreach.init()'s requirement
that the references
+ * be present in the context, and Foreach.init() is called before set.render().
+ * Or move all of the render() code in here...
+ */
+ public Object init(Context context, Object data) throws Exception
+ {
+ /*
+ * init the tree correctly
+ */
+
+ super.init( context, data );
+
+ /*
+ * get the right side of the #set, and only continue if an object array
+ */
+
+ right = getRightHandSide();
+
+ if ( right == null || ( right.toString() != null && !
right.toString().equals("ObjectArray")) )
+ return data;
+
+ /*
+ * otherwise, get the value and stuffit!
+ */
+
+ value = right.value(context);
+
+ if ( !( value instanceof Object[]) )
+ return data;
+
+ if ( value != null)
+ {
+ left = getLeftHandSide();
+
+ if (left != null && left.jjtGetNumChildren() == 0)
+ context.put(left.getFirstToken().image.substring(1), value);
+ }
+
+ return data;
+ }
public boolean render(Context context, Writer writer)
throws IOException