Repository: incubator-freemarker Updated Branches: refs/heads/3 e3486d9e6 -> df580b495
(Removed #foreach from some more places) Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/c4a9f6fd Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/c4a9f6fd Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/c4a9f6fd Branch: refs/heads/3 Commit: c4a9f6fd6f42b4c89b9be82ea3053b9d0d5c8da3 Parents: e3486d9 Author: ddekany <[email protected]> Authored: Fri Mar 3 22:25:00 2017 +0100 Committer: ddekany <[email protected]> Committed: Fri Mar 3 22:25:00 2017 +0100 ---------------------------------------------------------------------- src/main/java/org/apache/freemarker/core/ASTDirective.java | 1 - .../apache/freemarker/test/templatesuite/expected/iterators.txt | 2 -- .../apache/freemarker/test/templatesuite/templates/iterators.ftl | 2 -- 3 files changed, 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/c4a9f6fd/src/main/java/org/apache/freemarker/core/ASTDirective.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/ASTDirective.java b/src/main/java/org/apache/freemarker/core/ASTDirective.java index 3506036..778fed1 100644 --- a/src/main/java/org/apache/freemarker/core/ASTDirective.java +++ b/src/main/java/org/apache/freemarker/core/ASTDirective.java @@ -62,7 +62,6 @@ abstract class ASTDirective extends ASTElement { addName(allNames, lcNames, ccNames, "escape"); addName(allNames, lcNames, ccNames, "fallback"); addName(allNames, lcNames, ccNames, "flush"); - addName(allNames, lcNames, ccNames, "foreach", "forEach"); addName(allNames, lcNames, ccNames, "ftl"); addName(allNames, lcNames, ccNames, "function"); addName(allNames, lcNames, ccNames, "global"); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/c4a9f6fd/src/test/resources/org/apache/freemarker/test/templatesuite/expected/iterators.txt ---------------------------------------------------------------------- diff --git a/src/test/resources/org/apache/freemarker/test/templatesuite/expected/iterators.txt b/src/test/resources/org/apache/freemarker/test/templatesuite/expected/iterators.txt index ef1954c..fb44def 100644 --- a/src/test/resources/org/apache/freemarker/test/templatesuite/expected/iterators.txt +++ b/src/test/resources/org/apache/freemarker/test/templatesuite/expected/iterators.txt @@ -68,8 +68,6 @@ <p>four</p> <p>five</p> -<p>Now test the list and foreach keywords...</p> - <p>one</p> <p>two</p> <p>three</p> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/c4a9f6fd/src/test/resources/org/apache/freemarker/test/templatesuite/templates/iterators.ftl ---------------------------------------------------------------------- diff --git a/src/test/resources/org/apache/freemarker/test/templatesuite/templates/iterators.ftl b/src/test/resources/org/apache/freemarker/test/templatesuite/templates/iterators.ftl index 2fd9b21..389abf3 100644 --- a/src/test/resources/org/apache/freemarker/test/templatesuite/templates/iterators.ftl +++ b/src/test/resources/org/apache/freemarker/test/templatesuite/templates/iterators.ftl @@ -59,8 +59,6 @@ <p>${item}</p> </#list> -<p>Now test the list and foreach keywords...</p> - <#list hash2["value"].key as key> <p>${key}</p> </#list>
