Repository: incubator-freemarker Updated Branches: refs/heads/3 9047d13b9 -> e3486d9e6
(Fixed some refactoring ugliness in FTL.jj) Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/9cab8d1a Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/9cab8d1a Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/9cab8d1a Branch: refs/heads/3 Commit: 9cab8d1aab1c354ce2a39c230ca19f618f01bacc Parents: 9047d13 Author: ddekany <[email protected]> Authored: Fri Mar 3 21:58:20 2017 +0100 Committer: ddekany <[email protected]> Committed: Fri Mar 3 21:58:20 2017 +0100 ---------------------------------------------------------------------- src/main/javacc/FTL.jj | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/9cab8d1a/src/main/javacc/FTL.jj ---------------------------------------------------------------------- diff --git a/src/main/javacc/FTL.jj b/src/main/javacc/FTL.jj index cce8d18..29a08c4 100644 --- a/src/main/javacc/FTL.jj +++ b/src/main/javacc/FTL.jj @@ -2513,7 +2513,7 @@ ASTDirList ForEach() : } } -ASTDirItems ASTDirItems() : +ASTDirItems Items() : { Token loopVar, loopVar2 = null, start, end; TemplateElements children; @@ -2572,7 +2572,7 @@ ASTDirItems ASTDirItems() : } } -ASTDirSep ASTDirSep() : +ASTDirSep Sep() : { Token loopVar, start, end = null; TemplateElements children; @@ -2984,7 +2984,7 @@ ASTElement Assign() : ) } -ASTDirInclude ASTDirInclude() : +ASTDirInclude Include() : { ASTExpression nameExp; Token att, start, end; @@ -3048,7 +3048,7 @@ ASTDirImport Import() : } } -ASTDirMacro ASTDirMacro() : +ASTDirMacro Macro() : { Token arg, start, end; ASTExpression nameExp; @@ -3310,7 +3310,7 @@ ArrayList PositionalArgs() : } -ASTComment ASTComment() : +ASTComment Comment() : { Token start, end; StringBuilder buf = new StringBuilder(); @@ -3658,21 +3658,21 @@ ASTElement FreemarkerDirective() : | tp = Assign() | - tp = ASTDirInclude() + tp = Include() | tp = Import() | - tp = ASTDirMacro() + tp = Macro() | tp = Compress() | tp = UnifiedMacroTransform() | - tp = ASTDirItems() + tp = Items() | - tp = ASTDirSep() + tp = Sep() | - tp = ASTComment() + tp = Comment() | tp = NoParse() |
