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/42cfb326 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/42cfb326 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/42cfb326 Branch: refs/heads/3 Commit: 42cfb3261b4f591d822ca91d443f82e12f3e98a5 Parents: 28102af 9b31510 Author: Woonsan Ko <woon...@apache.org> Authored: Wed Jul 5 20:51:00 2017 -0400 Committer: Woonsan Ko <woon...@apache.org> Committed: Wed Jul 5 20:51:00 2017 -0400 ---------------------------------------------------------------------- .../core/FM2ASTToFM3SourceConverter.java | 289 +++++++++++++------ .../converter/ConversionWarnReceiver.java | 44 +++ .../apache/freemarker/converter/Converter.java | 30 +- .../freemarker/converter/FM2ToFM3Converter.java | 5 +- .../converter/LoggingWarnReceiver.java | 44 +++ .../converter/FM2ToFM3ConverterTest.java | 18 ++ 6 files changed, 332 insertions(+), 98 deletions(-) ----------------------------------------------------------------------
