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 2017/07/14 10:48:01 UTC
[2/4] incubator-freemarker git commit: Merge branch '3' into
feature/FREEMARKER-55
Merge branch '3' into feature/FREEMARKER-55
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/36e04dfc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/36e04dfc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/36e04dfc
Branch: refs/heads/3
Commit: 36e04dfceff14d6604067e3e05e59f0cf8b042f7
Parents: 576b0ff a715679
Author: Woonsan Ko <wo...@apache.org>
Authored: Thu Jul 13 15:43:26 2017 -0400
Committer: Woonsan Ko <wo...@apache.org>
Committed: Thu Jul 13 15:43:26 2017 -0400
----------------------------------------------------------------------
.../core/FM2ASTToFM3SourceConverter.java | 142 ++++++---
.../apache/freemarker/converter/Converter.java | 17 +-
.../freemarker/converter/FM2ToFM3Converter.java | 47 ++-
.../converter/FM2ToFM3ConverterTest.java | 44 ++-
.../org/apache/freemarker/core/ast-builtins.ast | 8 +-
.../org/apache/freemarker/core/ast-builtins.ftl | 4 +-
.../apache/freemarker/core/ast-locations.ftl | 4 +-
.../org/apache/freemarker/core/ast-range.ast | 8 +-
.../org/apache/freemarker/core/ast-range.ftl | 2 +-
.../apache/freemarker/core/cano-builtins.ftl | 4 +-
.../freemarker/core/cano-builtins.ftl.out | 4 +-
.../core/cano-identifier-escaping.ftl | 8 +-
.../core/cano-identifier-escaping.ftl.out | 4 +-
.../templatesuite/templates/api-builtins.ftl | 16 +-
.../templates/boolean-formatting.ftl | 24 +-
.../templates/date-type-builtins.ftl | 46 +--
.../templates/dateformat-iso-bi.ftl | 228 +++++++-------
.../templates/dateformat-iso-like.ftl | 46 +--
.../templatesuite/templates/dateformat-java.ftl | 16 +-
.../templatesuite/templates/dateparsing.ftl | 30 +-
.../core/templatesuite/templates/escapes.ftl | 22 +-
.../templates/existence-operators.ftl | 40 +--
.../templatesuite/templates/hashliteral.ftl | 4 +-
.../templates/identifier-escaping.ftl | 8 +-
.../core/templatesuite/templates/if.ftl | 42 +--
.../core/templatesuite/templates/include2.ftl | 12 +-
.../templatesuite/templates/lastcharacter.ftl | 2 +-
.../core/templatesuite/templates/macros.ftl | 4 +-
.../core/templatesuite/templates/noparse.ftl | 16 +-
.../templatesuite/templates/number-format.ftl | 4 +-
.../templatesuite/templates/number-literal.ftl | 2 +-
.../templates/number-math-builtins.ftl | 60 ++--
.../templatesuite/templates/number-to-date.ftl | 22 +-
.../templatesuite/templates/numerical-cast.ftl | 2 +-
.../templates/output-encoding1.ftl | 8 +-
.../templates/output-encoding2.ftl | 6 +-
.../templates/output-encoding3.ftl | 6 +-
.../core/templatesuite/templates/root.ftl | 6 +-
.../templates/sequence-builtins.ftl | 240 +++++++--------
.../core/templatesuite/templates/setting.ftl | 26 +-
.../templatesuite/templates/specialvars.ftl | 10 +-
.../templates/string-builtin-coercion.ftl | 14 +-
.../string-builtins-regexps-matches.ftl | 2 +-
.../templates/string-builtins-regexps.ftl | 6 +-
.../templates/string-builtins1.ftl | 60 ++--
.../templates/string-builtins2.ftl | 184 ++++++------
.../templates/string-builtins3.ftl | 296 +++++++++----------
.../templatesuite/templates/stringbimethods.ftl | 8 +-
.../templatesuite/templates/type-builtins.ftl | 32 +-
.../core/templatesuite/templates/url.ftl | 6 +-
.../core/templatesuite/templates/var-layers.ftl | 8 +-
.../core/templatesuite/templates/varargs.ftl | 4 +-
.../core/templatesuite/templates/variables.ftl | 2 +-
.../templatesuite/templates/varlayers_lib.ftl | 6 +-
.../templates/wsstripinheader_inc.ftl | 2 +-
.../templates/wstrip-in-header.ftl | 2 +-
.../apache/freemarker/core/util/FTLUtil.java | 27 +-
.../templatesuite/templates/default-xmlns.ftl | 2 +-
.../templatesuite/templates/xml-fragment.ftl | 8 +-
.../templates/xml-ns_prefix-scope-lib.ftl | 2 +-
.../templates/xml-ns_prefix-scope-main.ftl | 2 +-
.../dom/templatesuite/templates/xmlns1.ftl | 2 +-
.../dom/templatesuite/templates/xmlns3.ftl | 12 +-
.../dom/templatesuite/templates/xmlns4.ftl | 12 +-
.../dom/templatesuite/templates/xmlns5.ftl | 2 +-
.../examples/AutoEscapingExample-convert.ftlh | 8 +-
.../examples/AutoEscapingExample-convert2.ftl | 6 +-
.../examples/AutoEscapingExample-infoBox.ftlh | 2 +-
.../examples/AutoEscapingExample-markup.ftlh | 6 +-
.../AutoEscapingExample-stringConcat.ftlh | 2 +-
.../AutoEscapingExample-stringLiteral2.ftlh | 2 +-
.../jsp/webapps/errors/failing-parsetime.ftlnv | 2 +-
72 files changed, 1067 insertions(+), 906 deletions(-)
----------------------------------------------------------------------