freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject incubator-freemarker git commit: (Or operator typos in FTL.jj)
Date Sat, 07 May 2016 10:10:32 GMT
Repository: incubator-freemarker
Updated Branches:
  refs/heads/2.3-gae 174c2b961 -> 8b4d84b0f


(Or operator typos 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/8b4d84b0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/8b4d84b0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/8b4d84b0

Branch: refs/heads/2.3-gae
Commit: 8b4d84b0f90c7960081f74e2ea70a2d889a13404
Parents: 174c2b9
Author: ddekany <ddekany@apache.org>
Authored: Sat May 7 12:10:14 2016 +0200
Committer: ddekany <ddekany@apache.org>
Committed: Sat May 7 12:10:14 2016 +0200

----------------------------------------------------------------------
 src/main/javacc/FTL.jj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8b4d84b0/src/main/javacc/FTL.jj
----------------------------------------------------------------------
diff --git a/src/main/javacc/FTL.jj b/src/main/javacc/FTL.jj
index bb8ac4f..7e7246c 100644
--- a/src/main/javacc/FTL.jj
+++ b/src/main/javacc/FTL.jj
@@ -1093,9 +1093,9 @@ TOKEN:
                     tip = "You may meant #list (http://freemarker.org/docs/ref_directive_list.html).";
                 } else if (dn.equals("prefix")) {
                     tip = "You may meant #import. " + PLANNED_DIRECTIVE_HINT;
-                } else if (dn.equals("item") | dn.equals("row") | dn.equals("rows")) {
+                } else if (dn.equals("item") || dn.equals("row") || dn.equals("rows")) {
                     tip = "You may meant #items.";
-                } else if (dn.equals("separator") | dn.equals("separate") | dn.equals("separ"))
{
+                } else if (dn.equals("separator") || dn.equals("separate") || dn.equals("separ"))
{
                     tip = "You may meant #sep.";
                 } else {
                     tip = "Help (latest version): http://freemarker.org/docs/ref_directive_alphaidx.html;
"


Mime
View raw message