projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Flag zero-zero as error in completeBER
[yaz-moved-to-github.git]
/
cql
/
cql.y
diff --git
a/cql/cql.y
b/cql/cql.y
index
daa3135
..
026dd36
100644
(file)
--- a/
cql/cql.y
+++ b/
cql/cql.y
@@
-1,4
+1,4
@@
-/* $Id: cql.y,v 1.4 2003-04-11 15:53:39 adam Exp $
+/* $Id: cql.y,v 1.6 2003-09-04 18:13:39 adam Exp $
Copyright (C) 2002-2003
Index Data Aps
Copyright (C) 2002-2003
Index Data Aps
@@
-44,7
+44,7
@@
See the file LICENSE.
%}
%pure_parser
%}
%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
%%
%expect 8
%%
@@
-114,6
+114,8
@@
searchClause:
}
;
}
;
+/* unary NOT search TERM here .. */
+
boolean:
AND | OR | NOT | PROX proxqualifiers {
$$ = $1;
boolean:
AND | OR | NOT | PROX proxqualifiers {
$$ = $1;
@@
-206,10
+208,7
@@
baseRelation:
| GE
| LE
| NE
| GE
| LE
| NE
-| EXACT
-| ALL
-| ANY
-| SCR
+| TERM
;
index:
;
index:
@@
-220,9
+219,6
@@
searchTerm:
| AND
| OR
| NOT
| AND
| OR
| NOT
-| EXACT
-| ALL
-| ANY
| PROX
;
| PROX
;
@@
-244,6
+240,8
@@
int cql_parser_stream(CQL_parser cp,
cp->getbyte = getbyte;
cp->ungetbyte = ungetbyte;
cp->client_data = client_data;
cp->getbyte = getbyte;
cp->ungetbyte = ungetbyte;
cp->client_data = client_data;
+ if (cp->top)
+ cql_node_destroy(cp->top);
cql_parse(cp);
if (cp->top)
return 0;
cql_parse(cp);
if (cp->top)
return 0;