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/17480993 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/17480993 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/17480993 Branch: refs/heads/2.3 Commit: 17480993a9cb625808478b2110b37deaf59865ed Parents: edefaa2 67a2ebd Author: ddekany <ddek...@apache.org> Authored: Tue Mar 20 22:48:11 2018 +0100 Committer: ddekany <ddek...@apache.org> Committed: Tue Mar 20 22:48:11 2018 +0100 ---------------------------------------------------------------------- src/main/java/freemarker/core/Assignment.java | 13 +- .../core/BuiltInsForStringsBasic.java | 2 +- .../core/InvalidReferenceException.java | 6 +- .../java/freemarker/template/Configuration.java | 51 ++++-- .../freemarker/template/utility/StringUtil.java | 55 ++++--- src/main/javacc/FTL.jj | 164 +++++++++---------- src/manual/en_US/book.xml | 63 ++++++- .../freemarker/core/MiscErrorMessagesTest.java | 7 + .../freemarker/template/ConfigurationTest.java | 5 + 9 files changed, 234 insertions(+), 132 deletions(-) ----------------------------------------------------------------------
