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/dd60aef1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/dd60aef1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/dd60aef1 Branch: refs/heads/2.3 Commit: dd60aef18fbe643298edf64e9eca999d0b7ca945 Parents: b257829 a671110 Author: ddekany <ddek...@apache.org> Authored: Sun Sep 17 12:56:03 2017 +0200 Committer: ddekany <ddek...@apache.org> Committed: Sun Sep 17 12:56:03 2017 +0200 ---------------------------------------------------------------------- README.md | 4 +- .../java/freemarker/core/BreakInstruction.java | 8 +- .../core/BreakOrContinueException.java | 12 ++ src/main/java/freemarker/core/BuiltIn.java | 4 +- .../freemarker/core/BuiltInsForSequences.java | 62 ++++---- .../freemarker/core/BuiltInsForStringsMisc.java | 2 +- .../freemarker/core/ContinueInstruction.java | 64 ++++++++ .../freemarker/core/DefaultToExpression.java | 16 +- src/main/java/freemarker/core/Environment.java | 10 +- .../java/freemarker/core/IteratorBlock.java | 102 +++++++------ src/main/java/freemarker/core/Macro.java | 3 +- src/main/java/freemarker/core/SwitchBlock.java | 2 +- src/main/java/freemarker/core/_CoreAPI.java | 1 + .../java/freemarker/ext/beans/BeanModel.java | 4 +- .../java/freemarker/ext/beans/BeansWrapper.java | 69 +++++---- .../ext/beans/BeansWrapperConfiguration.java | 15 ++ .../java/freemarker/ext/dom/ElementModel.java | 3 +- .../java/freemarker/ext/dom/NodeListModel.java | 22 +-- .../template/DefaultIterableAdapter.java | 2 +- .../freemarker/template/DefaultListAdapter.java | 2 +- .../DefaultNonListCollectionAdapter.java | 2 +- .../DefaultUnassignableIteratorAdapter.java | 52 ------- .../IteratorToTemplateModelIteratorAdapter.java | 50 ++++++ .../freemarker/template/utility/DeepUnwrap.java | 5 +- src/main/javacc/FTL.jj | 41 +++++ src/manual/en_US/book.xml | 153 ++++++++++++++++--- .../core/BreakAndContinuePlacementTest.java | 75 +++++++++ .../freemarker/core/BreakPlacementTest.java | 68 --------- .../freemarker/core/ListBreakContinueTest.java | 93 +++++++++++ .../freemarker/template/ConfigurationTest.java | 4 + .../template/DefaultObjectWrapperTest.java | 11 +- 31 files changed, 665 insertions(+), 296 deletions(-) ----------------------------------------------------------------------
