+ "got " + lexer.render());
String type = lexer.sval.toLowerCase();
match(lexer.ttype);
- if (!isRelation()) {
+ if (!isSymbolicRelation()) {
// It's a simple modifier consisting of type only
ms.addModifier(type);
} else {
debug("non-parenthesised term");
word = matchSymbol("index or term");
- if (!isRelation() && lexer.ttype != lexer.TT_WORD)
+ if (!isSymbolicRelation() && lexer.ttype != lexer.TT_WORD)
break;
index = word;
return new CQLPrefixNode(name, identifier, node);
}
- // Checks for a relation
private boolean isRelation() {
debug("isRelation: checking ttype=" + lexer.ttype +
" (" + lexer.render() + ")");
+ if (lexer.ttype == lexer.TT_WORD &&
+ (lexer.sval == "exact" ||
+ lexer.sval == "any" ||
+ lexer.sval == "all" ||
+ (lexer.sval == "scr" && compat == V1POINT2)))
+ return true;
+
+ return isSymbolicRelation();
+ }
+
+ private boolean isSymbolicRelation() {
+ debug("isSymbolicRelation: checking ttype=" + lexer.ttype +
+ " (" + lexer.render() + ")");
return (lexer.ttype == '<' ||
lexer.ttype == '>' ||
lexer.ttype == '=' ||