[engine] Fix VELOCITY-904 again
git-svn-id: https://svn.apache.org/repos/asf/velocity/engine/trunk@1872050 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java
index 9fca114..ea950f1 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java
@@ -26,6 +26,10 @@
import org.apache.velocity.runtime.RuntimeConstants;
import org.apache.velocity.runtime.RuntimeServices;
import org.apache.velocity.runtime.directive.Macro.MacroArg;
+import org.apache.velocity.runtime.parser.node.ASTMap;
+import org.apache.velocity.runtime.parser.node.ASTObjectArray;
+import org.apache.velocity.runtime.parser.node.ASTReference;
+import org.apache.velocity.runtime.parser.node.ASTStringLiteral;
import org.apache.velocity.runtime.parser.node.Node;
import org.apache.velocity.runtime.parser.node.SimpleNode;
import org.apache.velocity.util.StringUtils;
@@ -266,10 +270,13 @@ else if (old == NULL_VALUE_MARKER)
{
/* allow for nested calls */
Deque<String> literalsStack = (Deque<String>)context.get(literalArgArray[i]);
- literalsStack.removeFirst();
- if (literalsStack.size() == 0)
+ if (literalsStack != null) /* may be null if argument was missing in macro call */
{
- context.remove(literalArgArray[i]);
+ literalsStack.removeFirst();
+ if (literalsStack.size() == 0)
+ {
+ context.remove(literalArgArray[i]);
+ }
}
}
}
@@ -410,7 +417,15 @@ else if (strictArguments)
literalsStack = new LinkedList();
context.put(literalArgArray[i], literalsStack);
}
- literalsStack.addFirst(argNode.literal());
+ /* Reflects the strange 1.7 behavor... */
+ if (argNode instanceof ASTReference || argNode instanceof ASTStringLiteral || argNode instanceof ASTObjectArray || argNode instanceof ASTMap)
+ {
+ literalsStack.addFirst(argNode.literal());
+ }
+ else
+ {
+ literalsStack.addFirst('$' + macroArg.name);
+ }
}
}
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java
index 460a7b7..ff7a98c 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java
@@ -104,6 +104,11 @@ && getFirstToken().image.startsWith("\"")
*/
String img = getFirstToken().image;
+ /*
+ the literal string *should* contain enclosing quotes
+ */
+ literal = img;
+
image = img.substring(1, img.length() - 1);
if (img.startsWith("\""))
@@ -166,11 +171,6 @@ && getFirstToken().image.startsWith("\"")
return data;
}
- public String literal()
- {
- return image;
- }
-
/**
* Adjust all the line and column numbers that comprise a node so that they
* are corrected for the string literals position within the template file.
diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity904TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity904TestCase.java
index 04d7837..e1e5526 100755
--- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity904TestCase.java
+++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity904TestCase.java
@@ -68,4 +68,29 @@ public void testSubMacroPreserve()
assertEvalEquals("$param$param2$param", "#macro(macro1 $return)$return#macro2($param2)$return#end#macro(macro2 $return)$return#end#macro1($param)");
}
+ public void testNoArgNoPreserve()
+ {
+ assertEvalEquals("","#macro(testMacro $param)#end#testMacro()");
+ }
+
+ public void testNoArgPreserve()
+ {
+ assertEvalEquals("","#macro(testMacro $param)#end#testMacro()");
+ }
+
+ public void testConstantSetToNullNoPreserve()
+ {
+ assertEvalEquals("$input", "#macro(mymacro $input)#set($input = $null)$input#end#mymacro('string-value')");
+ assertEvalEquals("$input", "#macro(mymacro $input)#set($input = $null)$input#end#mymacro(\"interpolated-$bar-value\")");
+ assertEvalEquals("$input", "#macro(mymacro $input)#set($input = $null)$input#end#mymacro(true)");
+ assertEvalEquals("$input", "#macro(mymacro $input)#set($input = $null)$input#end#mymacro(4.5)");
+ }
+
+ public void testConstantSetToNullPreserve()
+ {
+ assertEvalEquals("'string-value'", "#macro(mymacro $input)#set($input = $null)$input#end#mymacro('string-value')");
+ assertEvalEquals("\"interpolated-$bar-value\"", "#macro(mymacro $input)#set($input = $null)$input#end#mymacro(\"interpolated-$bar-value\")");
+ assertEvalEquals("$input", "#macro(mymacro $input)#set($input = $null)$input#end#mymacro(true)");
+ assertEvalEquals("$input", "#macro(mymacro $input)#set($input = $null)$input#end#mymacro(4.5)");
+ }
}
