Return-Path: X-Original-To: apmail-freemarker-notifications-archive@minotaur.apache.org Delivered-To: apmail-freemarker-notifications-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 98A94181B5 for ; Wed, 30 Dec 2015 18:11:25 +0000 (UTC) Received: (qmail 29853 invoked by uid 500); 30 Dec 2015 18:11:25 -0000 Delivered-To: apmail-freemarker-notifications-archive@freemarker.apache.org Received: (qmail 29825 invoked by uid 500); 30 Dec 2015 18:11:25 -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 29796 invoked by uid 99); 30 Dec 2015 18:11:25 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Dec 2015 18:11:25 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id EFA4BC0EAA for ; Wed, 30 Dec 2015 18:11:24 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.226 X-Spam-Level: * X-Spam-Status: No, score=1.226 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.554] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id paDeoU2Y-gf5 for ; Wed, 30 Dec 2015 18:11:24 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id C0B58439F3 for ; Wed, 30 Dec 2015 18:11:22 +0000 (UTC) Received: (qmail 29378 invoked by uid 99); 30 Dec 2015 18:11:22 -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; Wed, 30 Dec 2015 18:11:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 28D69E0B19; Wed, 30 Dec 2015 18:11:22 +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: Wed, 30 Dec 2015 18:11:52 -0000 Message-Id: <478b3838e6884b05b9772006c42b31e1@git.apache.org> In-Reply-To: <5bc2e3812f964818b5fa5a690376afc9@git.apache.org> References: <5bc2e3812f964818b5fa5a690376afc9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [32/35] incubator-freemarker git commit: (Fixed compilation error in FTL.jj-generated code) (Fixed compilation error in FTL.jj-generated code) Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/957264e7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/957264e7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/957264e7 Branch: refs/heads/2.3 Commit: 957264e7984803f8c4ae528ebf5dfd2405ac69de Parents: 64c1b08 Author: ddekany Authored: Tue Dec 29 19:29:10 2015 +0100 Committer: ddekany Committed: Tue Dec 29 19:29:10 2015 +0100 ---------------------------------------------------------------------- src/main/javacc/FTL.jj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/957264e7/src/main/javacc/FTL.jj ---------------------------------------------------------------------- diff --git a/src/main/javacc/FTL.jj b/src/main/javacc/FTL.jj index 9c858e8..b800eb4 100644 --- a/src/main/javacc/FTL.jj +++ b/src/main/javacc/FTL.jj @@ -860,7 +860,7 @@ TOKEN: <#CLOSE_TAG2 : ()* ("/")? (">" | "]")> | /* - * ATTENTION: Update _CoreAPI.BUILT_IN_DIRECTIVE_NAMES if you add new directives! + * ATTENTION: Update _CoreAPI.*_BUILT_IN_DIRECTIVE_NAMES if you add new directives! */ "attempt" > { strictSyntaxCheck(matchedToken, DEFAULT); } | @@ -1033,7 +1033,7 @@ TOKEN: " | "]")> { ftlHeader(matchedToken); } | /* - * ATTENTION: Update _CoreAPI.BUILT_IN_DIRECTIVE_NAMES if you add new directives! + * ATTENTION: Update _CoreAPI.*_BUILT_IN_DIRECTIVE_NAMES if you add new directives! */ { @@ -1060,7 +1060,7 @@ TOKEN: // doesn't match any directive starter tokens, because that token requires whitespace after the // name as it should be followed by parameters. For now we work this around so we don't report // unknown directive: - if (_CoreAPI.BUILT_IN_DIRECTIVE_NAMES.contains(dn)) { + if (_CoreAPI.ALL_BUILT_IN_DIRECTIVE_NAMES.contains(dn)) { throw new TokenMgrError( "#" + dn + " is an existing directive, but the tag is malformed. " + " (See FreeMarker Manual / Directive Reference.)",