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 2017/07/04 07:44:23 UTC
[12/16] incubator-freemarker git commit: Merge branch '3' into
feature/FREEMARKER-55
Merge branch '3' into feature/FREEMARKER-55
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/6ff7849b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/6ff7849b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/6ff7849b
Branch: refs/heads/3
Commit: 6ff7849be9bc71ee6fe81f4db6ab3530d7c8296e
Parents: 4088f91 1907182
Author: Woonsan Ko <wo...@apache.org>
Authored: Mon Jul 3 22:23:05 2017 -0400
Committer: Woonsan Ko <wo...@apache.org>
Committed: Mon Jul 3 22:23:05 2017 -0400
----------------------------------------------------------------------
FM3-CHANGE-LOG.txt | 9 +-
.../core/FM2ASTToFM3SourceConverter.java | 674 ++++++++++++++-----
.../freemarker/converter/FM2ToFM3Converter.java | 13 +-
.../converter/FM2ToFM3ConverterTest.java | 102 ++-
.../freemarker/core/util/FTLUtilTest.java | 10 +
.../freemarker/core/ast-strlitinterpolation.ast | 2 +-
.../core/templatesuite/templates/recover.ftl | 8 +-
.../apache/freemarker/core/util/FTLUtil.java | 38 +-
freemarker-core/src/main/javacc/FTL.jj | 6 +-
9 files changed, 661 insertions(+), 201 deletions(-)
----------------------------------------------------------------------