Support for "==" relation (TT_EQEQ)

[cql-java-moved-to-github.git] / src / org / z3950 / zing / cql / CQLLexer.java

diff --git a/src/org/z3950/zing/cql/CQLLexer.java b/src/org/z3950/zing/cql/CQLLexer.java
index 52b81f7..01cc05d 100644 (file)
--- a/src/org/z3950/zing/cql/CQLLexer.java
+++ b/src/org/z3950/zing/cql/CQLLexer.java
@@ -1,4 +1,4 @@
-// $Id: CQLLexer.java,v 1.2 2002-10-31 22:22:01 mike Exp $
+// $Id: CQLLexer.java,v 1.13 2007-06-29 15:38:56 mike Exp $
 
 package org.z3950.zing.cql;
 import java.io.StreamTokenizer;
@@ -19,19 +19,11 @@ class CQLLexer extends StreamTokenizer {
     static int TT_LE        = 1000;    // The "<=" relation
     static int TT_GE        = 1001;    // The ">=" relation
     static int TT_NE        = 1002;    // The "<>" relation
-    static int TT_AND       = 1003;    // The "and" boolean
-    static int TT_OR        = 1004;    // The "or" boolean
-    static int TT_NOT       = 1005;    // The "not" boolean
-    static int TT_PROX      = 1006;    // The "prox" boolean
-    static int TT_ANY       = 1007;    // The "any" relation
-    static int TT_ALL       = 1008;    // The "all" relation
-    static int TT_EXACT     = 1009;    // The "exact" relation
-    static int TT_pWORD      = 1010;   // The "word" proximity unit
-    static int TT_SENTENCE  = 1011;    // The "sentence" proximity unit
-    static int TT_PARAGRAPH = 1012;    // The "paragraph" proximity unit
-    static int TT_ELEMENT   = 1013;    // The "element" proximity unit
-    static int TT_ORDERED   = 1014;    // The "ordered" proximity ordering
-    static int TT_UNORDERED = 1015;    // The "unordered" proximity ordering
+    static int TT_EQEQ      = 1003;    // The "==" relation
+    static int TT_AND       = 1004;    // The "and" boolean
+    static int TT_OR        = 1005;    // The "or" boolean
+    static int TT_NOT       = 1006;    // The "not" boolean
+    static int TT_PROX      = 1007;    // The "prox" boolean
 
     // Support for keywords.  It would be nice to compile this linear
     // list into a Hashtable, but it's hard to store ints as hash
@@ -52,15 +44,6 @@ class CQLLexer extends StreamTokenizer {
        new Keyword(TT_OR,  "or"),
        new Keyword(TT_NOT, "not"),
        new Keyword(TT_PROX, "prox"),
-       new Keyword(TT_ANY, "any"),
-       new Keyword(TT_ALL, "all"),
-       new Keyword(TT_EXACT, "exact"),
-       new Keyword(TT_pWORD, "word"),
-       new Keyword(TT_SENTENCE, "sentence"),
-       new Keyword(TT_PARAGRAPH, "paragraph"),
-       new Keyword(TT_ELEMENT, "element"),
-       new Keyword(TT_ORDERED, "ordered"),
-       new Keyword(TT_UNORDERED, "unordered"),
     };
 
     // For halfDecentPushBack() and the code at the top of nextToken()
@@ -74,6 +57,9 @@ class CQLLexer extends StreamTokenizer {
 
     CQLLexer(String cql, boolean lexdebug) {
        super(new StringReader(cql));
+       wordChars('!', '?');    // ASCII-dependency!
+       wordChars('[', '`');    // ASCII-dependency!
+       quoteChar('"');
        ordinaryChar('=');
        ordinaryChar('<');
        ordinaryChar('>');
@@ -141,6 +127,18 @@ class CQLLexer extends StreamTokenizer {
                ttype = '>';
                debug("AFTER: ttype is now " + ttype + " - " + render());
            }
+       } else if (ttype == '=') {
+           debug("token starts with '=' ...");
+           underlyingNextToken();
+           if (ttype == '=') {
+               debug("token continues with '=' - it's '=='");
+               ttype = TT_EQEQ;
+           } else {
+               debug("next token is " + render() + " (pushed back)");
+               halfDecentPushBack();
+               ttype = '=';
+               debug("AFTER: ttype is now " + ttype + " - " + render());
+           }
        }
 
        debug("done nextToken(): ttype=" + ttype + ", " +
@@ -175,7 +173,11 @@ class CQLLexer extends StreamTokenizer {
        if (token == TT_EOF) {
            return "EOF";
        } else if (token == TT_NUMBER) {
-           return new Integer((int) nval).toString();
+           if ((double) nval == (int) nval) {
+               return new Integer((int) nval).toString();
+           } else {
+               return new Double((double) nval).toString();
+           }
        } else if (token == TT_WORD) {
            return "word: " + sval;
        } else if (token == '"') {
@@ -186,6 +188,8 @@ class CQLLexer extends StreamTokenizer {
            return ">=";
        } else if (token == TT_NE) {
            return "<>";
+       } else if (token == TT_EQEQ) {
+           return "==";
        }
 
        // Check whether its associated with one of the keywords