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
Remove HDCQL functionality
[yaz-moved-to-github.git]
/
src
/
cql.y
diff --git
a/src/cql.y
b/src/cql.y
index
4021373
..
67e2f76
100644
(file)
--- a/
src/cql.y
+++ b/
src/cql.y
@@
-1,10
+1,10
@@
/* 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.
* See the file LICENSE for details.
- */
+ */
/* bison parser for CQL grammar. */
%{
/* bison parser for CQL grammar. */
%{
-/**
+/**
* \file cql.c
* \brief Implements CQL parser.
*
* \file cql.c
* \brief Implements CQL parser.
*
@@
-34,7
+34,7
@@
size_t len;
/** size of buffer (len <= size) */
size_t size;
size_t len;
/** size of buffer (len <= size) */
size_t size;
- } token;
+ } token;
struct cql_parser {
int (*getbyte)(void *client_data);
struct cql_parser {
int (*getbyte)(void *client_data);
@@
-47,20
+47,20
@@
};
#define YYSTYPE token
};
#define YYSTYPE token
-
+
#define YYPARSE_PARAM parm
#define YYLEX_PARAM parm
#define YYPARSE_PARAM parm
#define YYLEX_PARAM parm
-
+
int yylex(YYSTYPE *lval, void *vp);
int yyerror(char *s);
%}
%pure_parser
int yylex(YYSTYPE *lval, void *vp);
int yyerror(char *s);
%}
%pure_parser
-%token DOTTERM TERM AND OR NOT PROX GE LE NE EXACT SORTBY
+%token SIMPLE_STRING AND OR NOT PROX GE LE NE EXACT SORTBY
%%
%%
-top: {
+top: {
$$.rel = cql_node_mk_sc(((CQL_parser) parm)->nmem,
"cql.serverChoice", "=", 0);
((CQL_parser) parm)->top = 0;
$$.rel = cql_node_mk_sc(((CQL_parser) parm)->nmem,
"cql.serverChoice", "=", 0);
((CQL_parser) parm)->top = 0;
@@
-89,7
+89,7
@@
sortSpec: sortSpec singleSpec {
| singleSpec
{
$$.cql = $1.cql;
| singleSpec
{
$$.cql = $1.cql;
-};
+};
singleSpec: index modifiers {
$$.cql = cql_node_mk_sort(((CQL_parser) parm)->nmem, $1.buf, $2.cql);
singleSpec: index modifiers {
$$.cql = cql_node_mk_sort(((CQL_parser) parm)->nmem, $1.buf, $2.cql);
@@
-115,20
+115,20
@@
cqlQuery:
| '>' searchTerm {
$$.rel = $0.rel;
} cqlQuery {
| '>' searchTerm {
$$.rel = $0.rel;
} cqlQuery {
- $$.cql = cql_apply_prefix(((CQL_parser) parm)->nmem,
+ $$.cql = cql_apply_prefix(((CQL_parser) parm)->nmem,
$4.cql, 0, $2.buf);
}
;
$4.cql, 0, $2.buf);
}
;
-scopedClause:
+scopedClause:
searchClause
|
searchClause
|
- scopedClause boolean modifiers {
+ scopedClause boolean modifiers {
$$.rel = $0.rel;
} searchClause {
struct cql_node *cn = cql_node_mk_boolean(((CQL_parser) parm)->nmem,
$2.buf);
$$.rel = $0.rel;
} searchClause {
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.right = $5.cql;
cn->u.boolean.modifiers = $3.cql;
cn->u.boolean.left = $1.cql;
cn->u.boolean.right = $5.cql;
@@
-137,21
+137,21
@@
scopedClause:
}
;
}
;
-searchClause:
- '(' {
+searchClause:
+ '(' {
$$.rel = $0.rel;
$$.rel = $0.rel;
-
+
} cqlQuery ')' {
$$.cql = $3.cql;
}
|
} cqlQuery ')' {
$$.cql = $3.cql;
}
|
-searchTerm extraTerms {
+searchTerm {
struct cql_node *st = cql_node_dup(((CQL_parser) parm)->nmem, $0.rel);
struct cql_node *st = cql_node_dup(((CQL_parser) parm)->nmem, $0.rel);
- st->u.st.extra_terms = $2.cql;
st->u.st.term = nmem_strdup(((CQL_parser)parm)->nmem, $1.buf);
$$.cql = st;
}
st->u.st.term = nmem_strdup(((CQL_parser)parm)->nmem, $1.buf);
$$.cql = st;
}
-|
+
+|
index relation modifiers {
$$.rel = cql_node_mk_sc(((CQL_parser) parm)->nmem, $1.buf, $2.buf, 0);
$$.rel->u.st.modifiers = $3.cql;
index relation modifiers {
$$.rel = cql_node_mk_sc(((CQL_parser) parm)->nmem, $1.buf, $2.buf, 0);
$$.rel->u.st.modifiers = $3.cql;
@@
-161,25
+161,13
@@
searchTerm extraTerms {
}
;
}
;
-extraTerms:
-extraTerms TERM {
- 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;
- $$.cql = st;
-}
-|
-{ $$.cql = 0; }
-;
+/* unary NOT search SIMPLE_STRING here .. */
-
-/* unary NOT search TERM here .. */
-
-boolean:
+boolean:
AND | OR | NOT | PROX ;
modifiers: modifiers '/' searchTerm
AND | OR | NOT | PROX ;
modifiers: modifiers '/' searchTerm
-{
+{
struct cql_node *mod = cql_node_mk_sc(((CQL_parser)parm)->nmem,
$3.buf, 0, 0);
struct cql_node *mod = cql_node_mk_sc(((CQL_parser)parm)->nmem,
$3.buf, 0, 0);
@@
-187,7
+175,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);
@@
-196,38
+184,28
@@
modifiers '/' searchTerm mrelation searchTerm
$$.cql = mod;
}
|
$$.cql = mod;
}
|
-{
+{
$$.cql = 0;
}
;
$$.cql = 0;
}
;
-mrelation:
- '='
-| '>'
-| '<'
-| GE
-| LE
-| NE
-| EXACT
-;
+relation: SIMPLE_STRING | relation_symbol;
-relation:
- '='
-| '>'
+relation_symbol:
+ '='
+| '>'
| '<'
| GE
| LE
| NE
| EXACT
| '<'
| GE
| LE
| NE
| EXACT
-| DOTTERM
;
;
-index:
+index:
searchTerm;
searchTerm:
searchTerm;
searchTerm:
- TERM
-| DOTTERM
+ SIMPLE_STRING
| AND
| OR
| NOT
| AND
| OR
| NOT
@@
-254,7
+232,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)
@@
-343,15
+321,12
@@
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
{
- int relation_like = 0;
while (c != 0 && !strchr(" \n()=<>/", c))
{
while (c != 0 && !strchr(" \n()=<>/", c))
{
- if (c == '.')
- relation_like = 1;
if (c == '\\')
{
putb(lval, cp, c);
if (c == '\\')
{
putb(lval, cp, c);
@@
-393,14
+368,8
@@
int yylex(YYSTYPE *lval, void *vp)
lval->buf = "sortby";
return SORTBY;
}
lval->buf = "sortby";
return SORTBY;
}
- if (!cql_strcmp(lval->buf, "all"))
- relation_like = 1;
- if (!cql_strcmp(lval->buf, "any"))
- relation_like = 1;
- if (relation_like)
- return DOTTERM;
}
}
- return TERM;
+ return SIMPLE_STRING;
}
}
@@
-422,7
+391,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;