This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a change to branch 2.3
in repository https://gitbox.apache.org/repos/asf/freemarker.git.
from 2ba7e9c Merge remote-tracking branch 'origin/2.3-gae' into 2.3
add 36e33ae (HashLiteral code cleanup)
add 6528830 (Deprecated old XML wrapper class)
add 9e4c950 (Variable name typo)
add 6059fc2 Show valid parameter names in the error message when a macro
is called with an invalid parameter name
add bcde758 Renamed ?spread_args to ?with_args
add ea7cd6e Added special rule to allow using the directive name in the
end-tag when ?with_args(...) was used in the start-tag, like
<@myMacro?with_args(args)>...</@myMacro>.
add 06421cf (Manual fix)
new aee8eb4 Merge remote-tracking branch 'origin/2.3-gae' into 2.3
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/main/java/freemarker/core/BuiltIn.java | 6 +-
.../java/freemarker/core/BuiltInsForCallables.java | 42 +--
src/main/java/freemarker/core/Environment.java | 37 +-
src/main/java/freemarker/core/HashLiteral.java | 58 +--
src/main/java/freemarker/core/Macro.java | 29 +-
src/main/java/freemarker/core/MethodCall.java | 4 +
.../freemarker/template/utility/DOMNodeModel.java | 5 +-
src/main/javacc/FTL.jj | 27 +-
src/manual/en_US/book.xml | 399 +++++++++++----------
.../java/freemarker/core/EndTagSyntaxTest.java | 76 ++++
...gsBuiltInTest.java => WithArgsBuiltInTest.java} | 260 +++++++-------
...readArgsExamples.java => WithArgsExamples.java} | 4 +-
...hArgsExamples-usingWithArgsSpecialVariable.ftl} | 2 +-
...sExamples-usingWithArgsSpecialVariable.ftl.out} | 0
14 files changed, 530 insertions(+), 419 deletions(-)
create mode 100644 src/test/java/freemarker/core/EndTagSyntaxTest.java
rename src/test/java/freemarker/core/{SpreadArgsBuiltInTest.java =>
WithArgsBuiltInTest.java} (51%)
rename src/test/java/freemarker/manual/{SpreadArgsExamples.java =>
WithArgsExamples.java} (88%)
rename
src/test/resources/freemarker/manual/{SpreadArgsExamples-usingWithArgsSpecialVariable.ftl
=> WithArgsExamples-usingWithArgsSpecialVariable.ftl} (85%)
rename
src/test/resources/freemarker/manual/{SpreadArgsExamples-usingWithArgsSpecialVariable.ftl.out
=> WithArgsExamples-usingWithArgsSpecialVariable.ftl.out} (100%)
