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/edefaa2f Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/edefaa2f Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/edefaa2f Branch: refs/heads/2.3 Commit: edefaa2f6cdf00e1f979700b384f0b966873bde4 Parents: 0c69b19 0129453 Author: ddekany <ddek...@apache.org> Authored: Mon Mar 19 22:21:23 2018 +0100 Committer: ddekany <ddek...@apache.org> Committed: Mon Mar 19 22:21:23 2018 +0100 ---------------------------------------------------------------------- src/main/java/freemarker/core/Configurable.java | 7 +- .../java/freemarker/core/DollarVariable.java | 11 +- .../core/ExtendedDecimalFormatParser.java | 5 +- .../LegacyConstructorParserConfiguration.java | 9 +- .../java/freemarker/core/NumericalOutput.java | 5 +- .../freemarker/core/ParserConfiguration.java | 7 + .../java/freemarker/core/StringLiteral.java | 14 +- .../freemarker/core/TemplateConfiguration.java | 27 ++ ..._ParserConfigurationWithInheritedFormat.java | 4 + .../ext/beans/OverloadedNumberUtil.java | 2 +- .../java/freemarker/template/Configuration.java | 81 +++- src/main/java/freemarker/template/Template.java | 22 + .../java/freemarker/template/_TemplateAPI.java | 14 +- .../freemarker/template/utility/StringUtil.java | 22 +- src/main/javacc/FTL.jj | 258 +++++++---- src/manual/en_US/book.xml | 440 +++++++++++++++---- .../core/InterpolationSyntaxTest.java | 154 +++++++ .../core/ParsingErrorMessagesTest.java | 66 +-- .../core/TemplateConfigurationTest.java | 9 + .../freemarker/template/ConfigurationTest.java | 70 +++ .../template/utility/StringUtilTest.java | 24 + .../templates/string-builtins3.ftl | 4 +- 22 files changed, 1015 insertions(+), 240 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/edefaa2f/src/main/java/freemarker/template/Template.java ----------------------------------------------------------------------
