freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [freemarker] 01/01: Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Date Sat, 17 Aug 2019 20:17:45 GMT
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 dbbc5f50d9123717d6f15b74d6078973e2a4d49b
Merge: f70ac39 c94b7ae
Author: ddekany <ddekany@apache.org>
AuthorDate: Sat Aug 17 22:17:25 2019 +0200

    Merge remote-tracking branch 'origin/2.3-gae' into 2.3

 src/main/java/freemarker/core/EscapeBlock.java     |  8 ++-
 .../IntermediateStreamOperationLikeBuiltIn.java    | 21 +++++--
 .../freemarker/core/LocalLambdaExpression.java     | 36 ++++++++---
 .../freemarker/core/UncheckedParseException.java   | 37 +++++++++++
 src/main/javacc/FTL.jj                             |  2 +-
 src/main/resources/freemarker/version.properties   |  8 +--
 src/manual/en_US/book.xml                          | 42 ++++++++++++-
 src/test/java/freemarker/core/ASTTest.java         |  4 ++
 .../java/freemarker/core/LamdaAndEscapeTest.java   | 42 +++++++++++++
 src/test/resources/freemarker/core/ast-lambda.ast  | 72 ++++++++++++++++++++++
 src/test/resources/freemarker/core/ast-lambda.ftl  | 23 +++++++
 11 files changed, 271 insertions(+), 24 deletions(-)



Mime
View raw message