(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/master Commit: 957264e7984803f8c4ae528ebf5dfd2405ac69de Parents: 64c1b08 Author: ddekany <[email protected]> Authored: Tue Dec 29 19:29:10 2015 +0100 Committer: ddekany <[email protected]> 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 : (<BLANK>)* ("/")? (">" | "]")> | /* - * 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 : <START_TAG> "attempt" <CLOSE_TAG1>> { strictSyntaxCheck(matchedToken, DEFAULT); } | @@ -1033,7 +1033,7 @@ TOKEN: <TRIVIAL_FTL_HEADER : ("<#ftl" | "[#ftl") ("/")? (">" | "]")> { 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! */ <UNKNOWN_DIRECTIVE : ("[#" | "[/#" | "<#" | "</#") (["a"-"z", "A"-"Z", "_"])+> { @@ -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.)",
