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
Fixed overly ambitional conditional which led to incorrect handling of
[yaz-moved-to-github.git]
/
src
/
cql.y
diff --git
a/src/cql.y
b/src/cql.y
index
1206f21
..
187cba1
100644
(file)
--- a/
src/cql.y
+++ b/
src/cql.y
@@
-1,6
+1,6
@@
-/* $Id: cql.y,v 1.7 2004-10-15 00:19:00 adam Exp $
- Copyright (C) 2002-2004
- Index Data Aps
+/* $Id: cql.y,v 1.13 2006-12-14 09:05:18 adam Exp $
+ Copyright (C) 2002-2006
+ Index Data ApS
This file is part of the YAZ toolkit.
This file is part of the YAZ toolkit.
@@
-64,7
+64,8
@@
See the file LICENSE.
%%
top: {
%%
top: {
- $$.rel = cql_node_mk_sc("cql.serverChoice", "scr", 0);
+ $$.rel = cql_node_mk_sc(((CQL_parser) parm)->nmem,
+ "cql.serverChoice", "scr", 0);
((CQL_parser) parm)->top = 0;
} cqlQuery1 {
cql_node_destroy($$.rel);
((CQL_parser) parm)->top = 0;
} cqlQuery1 {
cql_node_destroy($$.rel);
@@
-85,7
+86,8
@@
cqlQuery:
cqlQuery boolean modifiers {
$$.rel = $0.rel;
} searchClause {
cqlQuery boolean modifiers {
$$.rel = $0.rel;
} searchClause {
- struct cql_node *cn = cql_node_mk_boolean($2.buf);
+ struct cql_node *cn = cql_node_mk_boolean(((CQL_parser) parm)->nmem,
+ $2.buf);
cn->u.boolean.modifiers = $3.cql;
cn->u.boolean.left = $1.cql;
cn->u.boolean.modifiers = $3.cql;
cn->u.boolean.left = $1.cql;
@@
-104,13
+106,13
@@
searchClause:
}
|
searchTerm {
}
|
searchTerm {
- struct cql_node *st = cql_node_dup ($0.rel);
- st->u.st.term = xstrdup($1.buf);
+ struct cql_node *st = cql_node_dup (((CQL_parser) parm)->nmem, $0.rel);
+ st->u.st.term = nmem_strdup(((CQL_parser)parm)->nmem, $1.buf);
$$.cql = st;
}
|
index relation modifiers {
$$.cql = st;
}
|
index relation modifiers {
- $$.rel = cql_node_mk_sc($1.buf, $2.buf, 0);
+ $$.rel = cql_node_mk_sc(((CQL_parser) parm)->nmem, $1.buf, $2.buf, 0);
$$.rel->u.st.modifiers = $3.cql;
} searchClause {
$$.cql = $5.cql;
$$.rel->u.st.modifiers = $3.cql;
} searchClause {
$$.cql = $5.cql;
@@
-119,24
+121,26
@@
searchClause:
| '>' searchTerm '=' searchTerm {
$$.rel = $0.rel;
} cqlQuery {
| '>' searchTerm '=' searchTerm {
$$.rel = $0.rel;
} cqlQuery {
- $$.cql = cql_apply_prefix($6.cql, $2.buf, $4.buf);
+ $$.cql = cql_apply_prefix(((CQL_parser) parm)->nmem,
+ $6.cql, $2.buf, $4.buf);
}
| '>' searchTerm {
$$.rel = $0.rel;
} cqlQuery {
}
| '>' searchTerm {
$$.rel = $0.rel;
} cqlQuery {
- $$.cql = cql_apply_prefix($4.cql, 0, $2.buf);
+ $$.cql = cql_apply_prefix(((CQL_parser) parm)->nmem,
+ $4.cql, 0, $2.buf);
}
;
/* unary NOT search TERM here .. */
boolean:
}
;
/* unary NOT search TERM here .. */
boolean:
- AND | OR | NOT | PROX
- ;
+ AND | OR | NOT | PROX ;
modifiers: modifiers '/' searchTerm
{
modifiers: modifiers '/' searchTerm
{
- struct cql_node *mod = cql_node_mk_sc($3.buf, "=", 0);
+ struct cql_node *mod = cql_node_mk_sc(((CQL_parser)parm)->nmem,
+ $3.buf, "=", 0);
mod->u.st.modifiers = $1.cql;
$$.cql = mod;
mod->u.st.modifiers = $1.cql;
$$.cql = mod;
@@
-144,7
+148,8
@@
modifiers: modifiers '/' searchTerm
|
modifiers '/' searchTerm mrelation searchTerm
{
|
modifiers '/' searchTerm mrelation searchTerm
{
- struct cql_node *mod = cql_node_mk_sc($3.buf, $4.buf, $5.buf);
+ struct cql_node *mod = cql_node_mk_sc(((CQL_parser)parm)->nmem,
+ $3.buf, $4.buf, $5.buf);
mod->u.st.modifiers = $1.cql;
$$.cql = mod;
mod->u.st.modifiers = $1.cql;
$$.cql = mod;
@@
-280,27
+285,38
@@
int yylex(YYSTYPE *lval, void *vp)
}
else
{
}
else
{
- putb(lval, cp, c);
- while ((c = cp->getbyte(cp->client_data)) != 0 &&
- !strchr(" \n()=<>/", c))
+ while (c != 0 && !strchr(" \n()=<>/", c))
{
if (c == '\\')
c = cp->getbyte(cp->client_data);
putb(lval, cp, c);
{
if (c == '\\')
c = cp->getbyte(cp->client_data);
putb(lval, cp, c);
+ c = cp->getbyte(cp->client_data);
}
#if YYDEBUG
printf ("got %s\n", lval->buf);
#endif
if (c != 0)
cp->ungetbyte(c, cp->client_data);
}
#if YYDEBUG
printf ("got %s\n", lval->buf);
#endif
if (c != 0)
cp->ungetbyte(c, cp->client_data);
- if (!strcmp(lval->buf, "and"))
+ if (!cql_strcmp(lval->buf, "and"))
+ {
+ lval->buf = "and";
return AND;
return AND;
- if (!strcmp(lval->buf, "or"))
+ }
+ if (!cql_strcmp(lval->buf, "or"))
+ {
+ lval->buf = "or";
return OR;
return OR;
- if (!strcmp(lval->buf, "not"))
+ }
+ if (!cql_strcmp(lval->buf, "not"))
+ {
+ lval->buf = "not";
return NOT;
return NOT;
- if (!strncmp(lval->buf, "prox", 4))
+ }
+ if (!cql_strcmp(lval->buf, "prox"))
+ {
+ lval->buf = "prox";
return PROX;
return PROX;
+ }
}
return TERM;
}
}
return TERM;
}