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 2015/12/19 15:23:40 UTC
[8/8] incubator-freemarker git commit: Merge remote-tracking branch
'origin/2.3-gae'
Merge remote-tracking branch 'origin/2.3-gae'
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/3a35d4d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/3a35d4d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/3a35d4d2
Branch: refs/heads/master
Commit: 3a35d4d2d887727cd7d139c675c915539615244e
Parents: a1356ed 0e5213a
Author: ddekany <dd...@apache.org>
Authored: Sat Dec 19 15:22:09 2015 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sat Dec 19 15:22:09 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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/3a35d4d2/src/main/java/freemarker/core/TemplateElementArrayBuilder.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/3a35d4d2/src/main/javacc/FTL.jj
----------------------------------------------------------------------