X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=cql%2Fcql.y;h=026dd3668bfa6fb1a2b6b60c5651d39367d49460;hp=e0a2265db381118fdfa11f4604fc7f1a6af33e1d;hb=13cf18688ed84678703cf643bf8b140d091c226e;hpb=f06ca89e9eb0d0205a5ed97154d81e0064942d02

diff --git a/cql/cql.y b/cql/cql.y
index e0a2265..026dd36 100644
--- a/cql/cql.y
+++ b/cql/cql.y
@@ -1,4 +1,4 @@
-/* $Id: cql.y,v 1.5 2003-06-04 09:44:05 adam Exp $
+/* $Id: cql.y,v 1.6 2003-09-04 18:13:39 adam Exp $
    Copyright (C) 2002-2003
    Index Data Aps
 
@@ -44,7 +44,7 @@ See the file LICENSE.
 %}
 
 %pure_parser
-%token TERM AND OR NOT PROX EXACT ALL ANY GE LE NE SCR
+%token TERM AND OR NOT PROX GE LE NE
 %expect 8
 
 %%
@@ -114,6 +114,8 @@ searchClause:
    }
 ;
 
+/* unary NOT search TERM here .. */
+
 boolean: 
   AND | OR | NOT | PROX proxqualifiers {
       $$ = $1;
@@ -206,10 +208,7 @@ baseRelation:
 | GE
 | LE
 | NE
-| EXACT 
-| ALL
-| ANY
-| SCR
+| TERM
 ;
 
 index: 
@@ -220,9 +219,6 @@ searchTerm:
 | AND
 | OR
 | NOT
-| EXACT
-| ALL
-| ANY
 | PROX
 ;