You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2015/10/04 21:17:18 UTC
[14/16] incubator-freemarker git commit: Merge remote-tracking branch
'origin/2.3-gae' into 2.3
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/a8814b88
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/a8814b88
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/a8814b88
Branch: refs/heads/2.3
Commit: a8814b8803a4cafe857924419cda475bf5ad07ec
Parents: 4b1550e 1e905a4
Author: ddekany <dd...@apache.org>
Authored: Sun Oct 4 16:45:42 2015 +0200
Committer: ddekany <dd...@apache.org>
Committed: Sun Oct 4 16:45:42 2015 +0200
----------------------------------------------------------------------
README.txt | 4 +-
.../freemarker/core/AddConcatExpression.java | 32 +---
src/main/java/freemarker/core/BuiltIn.java | 3 +-
.../core/BuiltInsForMultipleTypes.java | 24 ++-
.../java/freemarker/core/DollarVariable.java | 10 +-
src/main/java/freemarker/core/EvalUtil.java | 28 +++-
.../java/freemarker/core/Interpolation.java | 9 ++
.../java/freemarker/core/NumericalOutput.java | 18 ++-
.../java/freemarker/core/ParameterRole.java | 1 +
.../java/freemarker/core/StringLiteral.java | 105 +++++++-----
src/main/javacc/FTL.jj | 139 +++++++++++++---
src/manual/book.xml | 158 +++++++++++--------
.../freemarker/core/CoercionToTextualTest.java | 119 ++++++++++++++
.../freemarker/core/CorectionToTextualTest.java | 119 --------------
.../java/freemarker/core/DateFormatTest.java | 19 ++-
.../java/freemarker/core/NumberFormatTest.java | 4 +-
.../java/freemarker/core/OutputFormatTest.java | 32 +++-
.../core/ParsingErrorMessagesTest.java | 7 +
.../core/StringLiteralInterpolationTest.java | 77 ++++++++-
src/test/java/freemarker/test/TemplateTest.java | 6 +-
src/test/resources/freemarker/core/ast-1.ast | 19 +--
.../resources/freemarker/core/ast-builtins.ast | 3 -
.../resources/freemarker/core/ast-range.ast | 2 -
.../freemarker/core/ast-strlitinterpolation.ast | 72 +++++++--
.../freemarker/core/ast-strlitinterpolation.ftl | 8 +-
.../AutoEscapingExample-stringLiteral2.ftlh | 2 +-
.../AutoEscapingExample-stringLiteral2.ftlh.out | 2 +-
27 files changed, 677 insertions(+), 345 deletions(-)
----------------------------------------------------------------------