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
Change usage example.
[yaz-moved-to-github.git]
/
src
/
cql.y
diff --git
a/src/cql.y
b/src/cql.y
index
1086549
..
f4293e7
100644
(file)
--- a/
src/cql.y
+++ b/
src/cql.y
@@
-1,6
+1,6
@@
-/* $Id: cql.y,v 1.8 2004-11-01 20:13:02 adam Exp $
- Copyright (C) 2002-2004
- Index Data Aps
+/* $Id: cql.y,v 1.11 2006-10-05 16:19:16 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.
@@
-286,26
+286,25
@@
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"))
return AND;
return AND;
- if (!strcmp(lval->buf, "or"))
+ if (!cql_strcmp(lval->buf, "or"))
return OR;
return OR;
- if (!strcmp(lval->buf, "not"))
+ if (!cql_strcmp(lval->buf, "not"))
return NOT;
return NOT;
- if (!strncmp(lval->buf, "prox", 4))
+ if (!cql_strcmp(lval->buf, "prox"))
return PROX;
}
return TERM;
return PROX;
}
return TERM;