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/08/25 23:39:37 UTC
[11/19] incubator-freemarker git commit: (Fixed some parser error
message oversights.)
(Fixed some parser error message oversights.)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/61902c38
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/61902c38
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/61902c38
Branch: refs/heads/2.3
Commit: 61902c38b25d9a1bd51d4e65b759e80ee4f09071
Parents: 94a3c99
Author: ddekany <dd...@apache.org>
Authored: Sun Aug 20 23:56:41 2017 +0200
Committer: ddekany <dd...@apache.org>
Committed: Sun Aug 20 23:56:41 2017 +0200
----------------------------------------------------------------------
src/main/javacc/FTL.jj | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/61902c38/src/main/javacc/FTL.jj
----------------------------------------------------------------------
diff --git a/src/main/javacc/FTL.jj b/src/main/javacc/FTL.jj
index 2963a41..b7bdd48 100644
--- a/src/main/javacc/FTL.jj
+++ b/src/main/javacc/FTL.jj
@@ -1795,10 +1795,10 @@ Expression EqualityExpression() :
)
rhs = RelationalExpression()
{
- notHashLiteral(lhs, "scalar");
- notHashLiteral(rhs, "scalar");
- notListLiteral(lhs, "scalar");
- notListLiteral(rhs, "scalar");
+ notHashLiteral(lhs, "string");
+ notHashLiteral(rhs, "string");
+ notListLiteral(lhs, "string");
+ notListLiteral(rhs, "string");
result = new ComparisonExpression(lhs, rhs, t.image);
result.setLocation(template, lhs, rhs);
}
@@ -1832,10 +1832,10 @@ Expression RelationalExpression() :
)
rhs = RangeExpression()
{
- notHashLiteral(lhs, "scalar");
- notHashLiteral(rhs, "scalar");
- notListLiteral(lhs, "scalar");
- notListLiteral(rhs, "scalar");
+ notHashLiteral(lhs, "number");
+ notHashLiteral(rhs, "number");
+ notListLiteral(lhs, "number");
+ notListLiteral(rhs, "number");
notStringLiteral(lhs, "number");
notStringLiteral(rhs, "number");
result = new ComparisonExpression(lhs, rhs, t.image);