You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2017/06/28 13:24:33 UTC
incubator-freemarker git commit: Forward ported \and and & &
support from 2.3.27
Repository: incubator-freemarker
Updated Branches:
refs/heads/3 f3b89b5c6 -> 02aea4474
Forward ported \and and && support from 2.3.27
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/02aea447
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/02aea447
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/02aea447
Branch: refs/heads/3
Commit: 02aea4474ac5183d3488654c582eec9709ed7697
Parents: f3b89b5
Author: ddekany <dd...@apache.org>
Authored: Wed Jun 28 15:24:24 2017 +0200
Committer: ddekany <dd...@apache.org>
Committed: Wed Jun 28 15:24:24 2017 +0200
----------------------------------------------------------------------
.../apache/freemarker/core/templatesuite/templates/boolean.ftl | 4 ++++
freemarker-core/src/main/javacc/FTL.jj | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/02aea447/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/boolean.ftl
----------------------------------------------------------------------
diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/boolean.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/boolean.ftl
index ab11c64..49816ee 100644
--- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/boolean.ftl
+++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/boolean.ftl
@@ -71,6 +71,10 @@
<#else>
boolean4 && boolean5 failed.<br />
</#if></p>
+<@assert test=true && true />
+<@assert test=!(false && true) />
+<@assert test=true \and true />
+<@assert test=!(false \and true) />
<p>Now test list models:</p>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/02aea447/freemarker-core/src/main/javacc/FTL.jj
----------------------------------------------------------------------
diff --git a/freemarker-core/src/main/javacc/FTL.jj b/freemarker-core/src/main/javacc/FTL.jj
index 3214075..68c837e 100644
--- a/freemarker-core/src/main/javacc/FTL.jj
+++ b/freemarker-core/src/main/javacc/FTL.jj
@@ -1082,7 +1082,7 @@ TOKEN:
|
<PERCENT : "%">
|
- <AND : "&" | "&&" >
+ <AND : "&" | "&&" | "&&" | "\\and">
|
<OR : "|" | "||">
|