Merge branch '3' into feature/FREEMARKER-55-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/d0bd43c8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/d0bd43c8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/d0bd43c8 Branch: refs/heads/3 Commit: d0bd43c8e42a9b5b2834a2d5c139401fcb8fda2d Parents: 12f70ff 0b7d965 Author: Woonsan Ko <[email protected]> Authored: Wed Sep 6 10:02:01 2017 -0400 Committer: Woonsan Ko <[email protected]> Committed: Wed Sep 6 10:02:01 2017 -0400 ---------------------------------------------------------------------- FM3-CHANGE-LOG.txt | 12 +++ .../freemarker/core/SequenceBuiltInTest.java | 75 ++++++++++++++++++ .../core/cano-identifier-escaping.ftl | 2 +- .../core/cano-identifier-escaping.ftl.out | 2 +- .../expected/identifier-escaping.txt | 2 +- .../core/templatesuite/expected/macros.txt | 6 +- .../templatesuite/templates/hashliteral.ftl | 4 +- .../templates/identifier-escaping.ftl | 4 +- .../core/templatesuite/templates/macros.ftl | 2 +- .../freemarker/core/ASTExpAddOrConcat.java | 41 +++++----- .../apache/freemarker/core/ASTExpBuiltIn.java | 3 +- .../freemarker/core/ASTExpHashLiteral.java | 5 +- .../freemarker/core/BuiltInForSequence.java | 3 + .../freemarker/core/BuiltInsForHashes.java | 12 ++- .../freemarker/core/BuiltInsForSequences.java | 47 +++++++---- .../apache/freemarker/core/MessageUtils.java | 10 +++ .../apache/freemarker/core/NativeSequence.java | 4 + .../freemarker/core/model/impl/BeanModel.java | 4 +- .../core/model/impl/IterableAndSequence.java | 82 -------------------- 19 files changed, 179 insertions(+), 141 deletions(-) ----------------------------------------------------------------------
