From 7d8ec6eaa2b799a2c466605af660e381644c48cc Mon Sep 17 00:00:00 2001 From: Mike Taylor Date: Wed, 19 May 2010 23:41:25 +0100 Subject: [PATCH] Rename method isRelation() to isSymbolicRelation() --- src/main/java/org/z3950/zing/cql/CQLParser.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/z3950/zing/cql/CQLParser.java b/src/main/java/org/z3950/zing/cql/CQLParser.java index 58e0326..7580959 100644 --- a/src/main/java/org/z3950/zing/cql/CQLParser.java +++ b/src/main/java/org/z3950/zing/cql/CQLParser.java @@ -159,7 +159,7 @@ public class CQLParser { + "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 { @@ -192,7 +192,7 @@ public class CQLParser { 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; @@ -232,8 +232,8 @@ public class CQLParser { } // Checks for a relation - private boolean isRelation() { - debug("isRelation: checking ttype=" + lexer.ttype + + private boolean isSymbolicRelation() { + debug("isSymbolicRelation: checking ttype=" + lexer.ttype + " (" + lexer.render() + ")"); return (lexer.ttype == '<' || lexer.ttype == '>' || -- 1.7.10.4