You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2019/08/09 21:25:28 UTC

[freemarker] branch 2.3 updated (cfd1513 -> 09076b6)

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 cfd1513  Merge remote-tracking branch 'origin/2.3-gae' into 2.3
     add 56249c0  Documented ?filer, ?map, ?take_while, ?drop_while, and local lambdas.
     add 070d869  Added more information to the Manual, related to local lambdas and related built-ins. Some clarifications.
     add c4e21c0  typo
     add 5dac78b  Manual: ?sequence optimizations
     add fa54bbf  Fixed bug when lazily generated result was passed to ?join/?seq_contains/?seq_index_of, and the resulting method wasn't immediately called. Now left hand operand will be eagerly evaluated in such case.
     add c23319d  (Excluded ad-hoc tests from Ant compilation)
     add 6f93a9e  Removed isLazilyGeneratedTargetResultSupported, and added bi.setTarget instead, so BI-s can override that, and call target.enableLazilyGeneratedResult() themselves these. We call the same from setDirectlyCalled() as well, so it's less confusing if everyone just calls target.enableLazilyGeneratedResult() explicitly.
     add 410e597  Manual: Added more information about fallbackOnNullLoopVariable
     add 812ea00  Test to ensure that lambda precedence is low enough
     add fad5143  Manual: Improved 2.3.29 change log
     add afe20df  (Deleted accidentally added test ad-hoc test file)
     add 76e4919  Added some missing license headers.
     add 7b3dc8e  Increased version number to 2.3.29
     new 09076b6  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:
 build.xml                                          |   2 +-
 .../IntelliJ-IDEA/Java-code-style-FreeMarker.xml   |  18 +
 src/main/java/freemarker/core/BuiltIn.java         |  15 +-
 ...java => BuiltInWithDirectCallOptimization.java} |  17 +-
 .../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 +++++++++++++++++++--
 .../LambdaParsingTest.java}                        |  15 +-
 .../core/LazilyGeneratedCollectionTest.java        |  22 +
 src/test/java/freemarker/core/MapBiTest.java       |   5 +
 .../test/templatesuite/templates/range-lazy.ftl    |  19 +
 15 files changed, 999 insertions(+), 142 deletions(-)
 copy src/main/java/freemarker/core/{_Java8.java => BuiltInWithDirectCallOptimization.java} (65%)
 delete mode 100644 src/main/resources/freemarker/included.html
 copy src/test/java/freemarker/{template/NullConfigurationTest.java => core/LambdaParsingTest.java} (76%)


[freemarker] 01/01: Merge remote-tracking branch 'origin/2.3-gae' into 2.3

Posted by dd...@apache.org.
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 <dd...@apache.org>
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(-)