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 dbbc5f5 Merge remote-tracking branch 'origin/2.3-gae' into 2.3
add 9fd27e2 Fixed outdated test
add c7dc43f (Some cleanup in parser literal type error checks)
add 04a0a6f Fixed some typos in the Manual (including FREEMARKER-118)
add 5f87566 Fixed some typos in the Manual (including FREEMARKER-118)
add 177b4d2 Merge branch '2.3.29-maintenance' into 2.3-gae
add 7c24fe7 (Renamed NullTemplateModel to TemplateNullModel)
add 16dccc1 (Fixing some JavaDoc search-and-replace accident)
add 325d98d (Fixed some source code indentation issues)
add 985560b (Minor JavaDoc improvement)
add 2453c91 Added Environment.getDataModelOrSharedVariable
add d161ece Some code cleanup in Macro, UnifiedCall and related parser
code.
add 54905b6 Added ?spread_args, though it's likely not the final version
new 2070477 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/BodyInstruction.java | 2 +-
src/main/java/freemarker/core/BuiltIn.java | 6 +-
.../java/freemarker/core/BuiltInsForCallables.java | 226 +++++++++++
.../java/freemarker/core/BuiltInsForNodes.java | 55 ++-
src/main/java/freemarker/core/Environment.java | 231 ++++++++---
src/main/java/freemarker/core/EvalUtil.java | 6 +-
src/main/java/freemarker/core/IteratorBlock.java | 4 +-
src/main/java/freemarker/core/LocalContext.java | 2 +-
.../freemarker/core/LocalLambdaExpression.java | 2 +-
src/main/java/freemarker/core/Macro.java | 124 ++++--
src/main/java/freemarker/core/TemplateElement.java | 23 +-
...llTemplateModel.java => TemplateNullModel.java} | 8 +-
src/main/java/freemarker/core/TemplateObject.java | 16 +-
src/main/java/freemarker/core/UnifiedCall.java | 15 +-
src/main/java/freemarker/core/_MessageUtil.java | 7 +-
.../java/freemarker/template/Configuration.java | 8 +-
.../freemarker/template/SimpleObjectWrapper.java | 6 +-
.../template/TemplateDirectiveModel.java | 2 +-
src/main/javacc/FTL.jj | 39 +-
src/manual/en_US/book.xml | 105 ++++-
.../freemarker/core/SpreadArgsBuiltInTest.java | 442 +++++++++++++++++++++
.../template/DefaultObjectWrapperTest.java | 1 +
22 files changed, 1155 insertions(+), 175 deletions(-)
create mode 100644 src/main/java/freemarker/core/BuiltInsForCallables.java
rename src/main/java/freemarker/core/{NullTemplateModel.java =>
TemplateNullModel.java} (87%)
create mode 100644 src/test/java/freemarker/core/SpreadArgsBuiltInTest.java
