X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Forg%2Fz3950%2Fzing%2Fcql%2FCQLLexer.java;h=2cb0369e282b490c3f09763642e5702ef7acf1cc;hb=57b8aeb26a6aacaa478e6886ade3e40ca6eae2bb;hp=ce38eb6db2437b4a30e0ba07ffd43884f94fc6fd;hpb=cae635a47469f62058626e9b8231b231d0861fb0;p=cql-java-moved-to-github.git

diff --git a/src/org/z3950/zing/cql/CQLLexer.java b/src/org/z3950/zing/cql/CQLLexer.java
index ce38eb6..2cb0369 100644
--- 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.3 2002-11-01 23:45:28 mike Exp $
+// $Id: CQLLexer.java,v 1.6 2002-11-17 23:29:02 mike Exp $
 
 package org.z3950.zing.cql;
 import java.io.StreamTokenizer;
@@ -35,6 +35,8 @@ class CQLLexer extends StreamTokenizer {
     static int TT_RELEVANT  = 1016;	// The "relevant" relation modifier
     static int TT_FUZZY     = 1017;	// The "fuzzy" relation modifier
     static int TT_STEM      = 1018;	// The "stem" relation modifier
+    static int TT_SCR       = 1019;	// The server choice relation
+    static int TT_PHONETIC  = 1020;	// The "phonetic" relation modifier
 
     // Support for keywords.  It would be nice to compile this linear
     // list into a Hashtable, but it's hard to store ints as hash
@@ -67,6 +69,8 @@ class CQLLexer extends StreamTokenizer {
 	new Keyword(TT_RELEVANT, "relevant"),
 	new Keyword(TT_FUZZY, "fuzzy"),
 	new Keyword(TT_STEM, "stem"),
+	new Keyword(TT_SCR, "scr"),
+	new Keyword(TT_PHONETIC, "phonetic"),
     };
 
     // For halfDecentPushBack() and the code at the top of nextToken()
@@ -80,6 +84,9 @@ class CQLLexer extends StreamTokenizer {
 
     CQLLexer(String cql, boolean lexdebug) {
 	super(new StringReader(cql));
+	wordChars('!', '?');	// ASCII-dependency!
+	wordChars('[', '`');	// ASCII-dependency!
+	quoteChar('"');
 	ordinaryChar('=');
 	ordinaryChar('<');
 	ordinaryChar('>');