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 09076b6d88795bc9648eac7bb9d2d3c270551e7d Merge: cfd1513 7b3dc8e Author: ddekany <[email protected]> AuthorDate: Fri Aug 9 23:25:09 2019 +0200 Merge remote-tracking branch 'origin/2.3-gae' into 2.3 build.xml | 2 +- .../IntelliJ-IDEA/Java-code-style-FreeMarker.xml | 18 + src/main/java/freemarker/core/BuiltIn.java | 15 +- .../core/BuiltInWithDirectCallOptimization.java | 31 + .../freemarker/core/BuiltInsForMultipleTypes.java | 5 +- .../java/freemarker/core/BuiltInsForSequences.java | 35 +- .../IntermediateStreamOperationLikeBuiltIn.java | 5 +- src/main/javacc/FTL.jj | 18 + src/main/resources/freemarker/included.html | 9 - src/main/resources/freemarker/version.properties | 8 +- src/manual/en_US/book.xml | 948 +++++++++++++++++++-- .../java/freemarker/core/LambdaParsingTest.java | 33 + .../core/LazilyGeneratedCollectionTest.java | 22 + src/test/java/freemarker/core/MapBiTest.java | 5 + .../test/templatesuite/templates/range-lazy.ftl | 19 + 15 files changed, 1049 insertions(+), 124 deletions(-)
