Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 144DF200CD4 for ; Fri, 14 Jul 2017 12:48:06 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 12D9516D7FC; Fri, 14 Jul 2017 10:48:06 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 36A8516D7EF for ; Fri, 14 Jul 2017 12:48:05 +0200 (CEST) Received: (qmail 51889 invoked by uid 500); 14 Jul 2017 10:48:04 -0000 Mailing-List: contact notifications-help@freemarker.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@freemarker.incubator.apache.org Delivered-To: mailing list notifications@freemarker.incubator.apache.org Received: (qmail 51880 invoked by uid 99); 14 Jul 2017 10:48:04 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Jul 2017 10:48:04 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 00CE7180675 for ; Fri, 14 Jul 2017 10:48:04 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.722 X-Spam-Level: X-Spam-Status: No, score=-3.722 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_NUMSUBJECT=0.5, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id ryPVA7psiU5G for ; Fri, 14 Jul 2017 10:48:02 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 5CA0E5FDF0 for ; Fri, 14 Jul 2017 10:48:02 +0000 (UTC) Received: (qmail 51777 invoked by uid 99); 14 Jul 2017 10:48:01 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Jul 2017 10:48:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 20E89E97F4; Fri, 14 Jul 2017 10:48:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ddekany@apache.org To: notifications@freemarker.incubator.apache.org Date: Fri, 14 Jul 2017 10:48:01 -0000 Message-Id: <904546c6cc8f432f95f70706d4bb80fa@git.apache.org> In-Reply-To: <6515dbd4b37d4c8ca4a51dd500536a57@git.apache.org> References: <6515dbd4b37d4c8ca4a51dd500536a57@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/4] incubator-freemarker git commit: Merge branch '3' into feature/FREEMARKER-55 archived-at: Fri, 14 Jul 2017 10:48:06 -0000 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 Authored: Thu Jul 13 15:43:26 2017 -0400 Committer: Woonsan Ko 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(-) ----------------------------------------------------------------------