freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [8/8] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Date Sat, 19 Dec 2015 14:23:17 GMT
Merge remote-tracking branch 'origin/2.3-gae' into 2.3


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/5203c735
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/5203c735
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/5203c735

Branch: refs/heads/2.3
Commit: 5203c735a39f745afa0b5e7b556bb1022968a9b5
Parents: c942528 0e5213a
Author: ddekany <ddekany@apache.org>
Authored: Sat Dec 19 15:21:39 2015 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Sat Dec 19 15:21:39 2015 +0100

----------------------------------------------------------------------
 .../java/freemarker/core/Interpolation.java     |   5 +
 .../core/TemplateElementArrayBuilder.java       |   4 +
 src/main/javacc/FTL.jj                          |  60 ++++++++
 src/test/java/freemarker/core/ASTTest.java      |  23 +++-
 .../resources/freemarker/core/ast-locations.ast | 137 +++++++++++++++++++
 .../resources/freemarker/core/ast-locations.ftl |  18 +++
 .../core/ast-nestedignoredchildren.ast          |   2 +
 .../core/ast-nestedignoredchildren.ftl          |   1 +
 .../test/templatesuite/expected/if.txt          |   6 +
 .../templatesuite/expected/macros-return.txt    |   5 +
 .../test/templatesuite/templates/if.ftl         |   6 +
 .../templatesuite/templates/macros-return.ftl   |  16 +++
 .../freemarker/test/templatesuite/testcases.xml |   1 +
 13 files changed, 282 insertions(+), 2 deletions(-)
----------------------------------------------------------------------



Mime
View raw message