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
Bump year
[yaz-moved-to-github.git]
/
src
/
cql.y
diff --git
a/src/cql.y
b/src/cql.y
index
7bb83f8
..
fa4a181
100644
(file)
--- a/
src/cql.y
+++ b/
src/cql.y
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) 1995-2013 Index Data
* See the file LICENSE for details.
*/
/* bison parser for CQL grammar. */
* See the file LICENSE for details.
*/
/* bison parser for CQL grammar. */
@@
-17,7
+17,7
@@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
+#include <yaz/yaz-iconv.h>
#include <yaz/xmalloc.h>
#include <yaz/nmem.h>
#include <yaz/cql.h>
#include <yaz/xmalloc.h>
#include <yaz/nmem.h>
#include <yaz/cql.h>
@@
-56,7
+56,7
@@
%}
%pure_parser
%}
%pure_parser
-%token DOTTERM TERM AND OR NOT PROX GE LE NE EXACT SORTBY
+%token PREFIX_NAME SIMPLE_STRING AND OR NOT PROX GE LE NE EXACT SORTBY
%%
%%
@@
-66,17
+66,35
@@
top: {
((CQL_parser) parm)->top = 0;
} cqlQuery1 sortby {
cql_node_destroy($$.rel);
((CQL_parser) parm)->top = 0;
} cqlQuery1 sortby {
cql_node_destroy($$.rel);
- ((CQL_parser) parm)->top = $2.cql;
+ if ($3.cql)
+ {
+ $3.cql->u.sort.search = $2.cql;
+ ((CQL_parser) parm)->top = $3.cql;
+ } else {
+ ((CQL_parser) parm)->top = $2.cql;
+ }
}
;
sortby: /* empty */
}
;
sortby: /* empty */
-| SORTBY sortSpec;
-
-sortSpec: sortSpec singleSpec
-| singleSpec;
+ { $$.cql = 0; }
+| SORTBY sortSpec {
+ $$.cql = $2.cql;
+ };
+
+sortSpec: sortSpec singleSpec {
+ $$.cql = $1.cql;
+ $$.cql->u.sort.next = $2.cql;
+ }
+| singleSpec
+{
+ $$.cql = $1.cql;
+};
-singleSpec: index modifiers ;
+singleSpec: index modifiers {
+ $$.cql = cql_node_mk_sort(((CQL_parser) parm)->nmem, $1.buf, $2.cql);
+ }
+;
cqlQuery1: cqlQuery
| cqlQuery error {
cqlQuery1: cqlQuery
| cqlQuery error {
@@
-144,10
+162,10
@@
searchTerm extraTerms {
;
extraTerms:
;
extraTerms:
-extraTerms TERM {
+SIMPLE_STRING extraTerms {
struct cql_node *st = cql_node_mk_sc(((CQL_parser) parm)->nmem,
struct cql_node *st = cql_node_mk_sc(((CQL_parser) parm)->nmem,
- /* index */ 0, /* rel */ 0, $2.buf);
- st->u.st.extra_terms = $1.cql;
+ /* index */ 0, /* rel */ 0, $1.buf);
+ st->u.st.extra_terms = $2.cql;
$$.cql = st;
}
|
$$.cql = st;
}
|
@@
-155,7
+173,7
@@
extraTerms TERM {
;
;
-/* unary NOT search TERM here .. */
+/* unary NOT search SIMPLE_STRING here .. */
boolean:
AND | OR | NOT | PROX ;
boolean:
AND | OR | NOT | PROX ;
@@
-169,7
+187,7
@@
modifiers: modifiers '/' searchTerm
$$.cql = mod;
}
|
$$.cql = mod;
}
|
-modifiers '/' searchTerm mrelation searchTerm
+modifiers '/' searchTerm relation_symbol searchTerm
{
struct cql_node *mod = cql_node_mk_sc(((CQL_parser)parm)->nmem,
$3.buf, $4.buf, $5.buf);
{
struct cql_node *mod = cql_node_mk_sc(((CQL_parser)parm)->nmem,
$3.buf, $4.buf, $5.buf);
@@
-183,17
+201,9
@@
modifiers '/' searchTerm mrelation searchTerm
}
;
}
;
-mrelation:
- '='
-| '>'
-| '<'
-| GE
-| LE
-| NE
-| EXACT
-;
+relation: PREFIX_NAME | relation_symbol;
-relation:
+relation_symbol:
'='
| '>'
| '<'
'='
| '>'
| '<'
@@
-201,15
+211,14
@@
relation:
| LE
| NE
| EXACT
| LE
| NE
| EXACT
-| DOTTERM
;
index:
searchTerm;
searchTerm:
;
index:
searchTerm;
searchTerm:
- TERM
-| DOTTERM
+ SIMPLE_STRING
+| PREFIX_NAME
| AND
| OR
| NOT
| AND
| OR
| NOT
@@
-236,7
+245,7
@@
static void putb(YYSTYPE *lval, CQL_parser cp, int c)
{
char *nb = (char *)
nmem_malloc(cp->nmem, (lval->size = lval->len * 2 + 20));
{
char *nb = (char *)
nmem_malloc(cp->nmem, (lval->size = lval->len * 2 + 20));
- memcpy (nb, lval->buf, lval->len);
+ memcpy(nb, lval->buf, lval->len);
lval->buf = nb;
}
if (c)
lval->buf = nb;
}
if (c)
@@
-266,7
+275,7
@@
int yylex(YYSTYPE *lval, void *vp)
return 0;
if (c == '\n')
return 0;
return 0;
if (c == '\n')
return 0;
- } while (isspace(c));
+ } while (yaz_isspace(c));
if (strchr("()=></", c))
{
int c1;
if (strchr("()=></", c))
{
int c1;
@@
-325,7
+334,7
@@
int yylex(YYSTYPE *lval, void *vp)
putb(lval, cp, c);
}
putb(lval, cp, 0);
putb(lval, cp, c);
}
putb(lval, cp, 0);
- return TERM;
+ return SIMPLE_STRING;
}
else
{
}
else
{
@@
-379,10
+388,12
@@
int yylex(YYSTYPE *lval, void *vp)
relation_like = 1;
if (!cql_strcmp(lval->buf, "any"))
relation_like = 1;
relation_like = 1;
if (!cql_strcmp(lval->buf, "any"))
relation_like = 1;
+ if (!cql_strcmp(lval->buf, "adj"))
+ relation_like = 1;
if (relation_like)
if (relation_like)
- return DOTTERM;
+ return PREFIX_NAME;
}
}
- return TERM;
+ return SIMPLE_STRING;
}
}
@@
-395,8
+406,7
@@
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_node_destroy(cp->top);
cql_parse(cp);
if (cp->top)
return 0;
cql_parse(cp);
if (cp->top)
return 0;
@@
-405,7
+415,7
@@
int cql_parser_stream(CQL_parser cp,
CQL_parser cql_parser_create(void)
{
CQL_parser cql_parser_create(void)
{
- CQL_parser cp = (CQL_parser) xmalloc (sizeof(*cp));
+ CQL_parser cp = (CQL_parser) xmalloc(sizeof(*cp));
cp->top = 0;
cp->getbyte = 0;
cp->top = 0;
cp->getbyte = 0;
@@
-428,3
+438,12
@@
struct cql_node *cql_parser_result(CQL_parser cp)
{
return cp->top;
}
{
return cp->top;
}
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */