This is an automated email from the ASF dual-hosted git repository. ddekany pushed a commit to branch 2.3 in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit 207047734e2a15ac1eca605a6b30fcd33984efe3 Merge: dbbc5f5 54905b6 Author: ddekany <[email protected]> AuthorDate: Sun Oct 6 20:42:56 2019 +0200 Merge remote-tracking branch 'origin/2.3-gae' into 2.3 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(-) diff --cc src/main/java/freemarker/core/TemplateElement.java index 359363c,5f90b60..0a9519b --- a/src/main/java/freemarker/core/TemplateElement.java +++ b/src/main/java/freemarker/core/TemplateElement.java @@@ -22,9 -22,8 +22,10 @@@ package freemarker.core import java.io.IOException; import java.util.Collections; import java.util.Enumeration; + import java.util.Map; +import javax.swing.tree.TreeNode; + import freemarker.template.SimpleSequence; import freemarker.template.TemplateException; import freemarker.template.TemplateNodeModel;
