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/0c69b198 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/0c69b198 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/0c69b198 Branch: refs/heads/2.3 Commit: 0c69b19832c4cc2fb843080b00b281216d06618e Parents: 5bfa9ac 0c77097 Author: ddekany <ddek...@apache.org> Authored: Mon Mar 12 07:06:02 2018 +0100 Committer: ddekany <ddek...@apache.org> Committed: Mon Mar 12 07:06:02 2018 +0100 ---------------------------------------------------------------------- .../java/freemarker/core/ArithmeticEngine.java | 110 +++++++++++++++++-- src/main/java/freemarker/core/BuiltIn.java | 4 +- .../freemarker/core/BuiltInsForSequences.java | 68 ++++++++++++ .../template/DefaultIterableAdapter.java | 2 +- .../freemarker/template/utility/NumberUtil.java | 13 ++- src/manual/en_US/book.xml | 67 ++++++++++- .../core/BigDecimalArithmeticEngineTest.java | 97 ++++++++++++++++ src/test/java/freemarker/core/MinMaxBITest.java | 87 +++++++++++++++ 8 files changed, 434 insertions(+), 14 deletions(-) ----------------------------------------------------------------------
