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
Version 5.0.4
[yaz-moved-to-github.git]
/
src
/
cql.y
diff --git
a/src/cql.y
b/src/cql.y
index
8daf2cb
..
5af8777
100644
(file)
--- a/
src/cql.y
+++ b/
src/cql.y
@@
-1,25
+1,23
@@
-/* $Id: cql.y,v 1.16 2008-01-06 13:08:09 adam Exp $
- Copyright (C) 2002-2006
- Index Data ApS
-
-This file is part of the YAZ toolkit.
-
-See the file LICENSE.
-
- bison parser for CQL grammar.
-*/
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2013 Index Data
+ * See the file LICENSE for details.
+ */
+/* bison parser for CQL grammar. */
%{
%{
-/**
+/**
* \file cql.c
* \brief Implements CQL parser.
*
* This is a YACC parser, but since it must be reentrant, Bison is required.
* The original source file is cql.y.
*/
* \file cql.c
* \brief Implements CQL parser.
*
* This is a YACC parser, but since it must be reentrant, Bison is required.
* The original source file is cql.y.
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#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>
@@
-36,7
+34,7
@@
See the file LICENSE.
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);
@@
-46,32
+44,59
@@
See the file LICENSE.
int last_pos;
struct cql_node *top;
NMEM nmem;
int last_pos;
struct cql_node *top;
NMEM nmem;
+ int strict;
};
#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
+%token PREFIX_NAME 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;
-} cqlQuery1 {
+} cqlQuery1 sortby {
cql_node_destroy($$.rel);
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 */
+ { $$.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 {
+ $$.cql = cql_node_mk_sort(((CQL_parser) parm)->nmem, $1.buf, $2.cql);
+ }
+;
+
cqlQuery1: cqlQuery
| cqlQuery error {
cql_node_destroy($1.cql);
cqlQuery1: cqlQuery
| cqlQuery error {
cql_node_destroy($1.cql);
@@
-91,20
+116,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;
@@
-113,20
+138,21
@@
scopedClause:
}
;
}
;
-searchClause:
- '(' {
+searchClause:
+ '(' {
$$.rel = $0.rel;
$$.rel = $0.rel;
-
+
} cqlQuery ')' {
$$.cql = $3.cql;
}
|
} cqlQuery ')' {
$$.cql = $3.cql;
}
|
- searchTerm {
- struct cql_node *st = cql_node_dup (((CQL_parser) parm)->nmem, $0.rel);
+searchTerm extraTerms {
+ 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;
@@
-136,13
+162,25
@@
searchClause:
}
;
}
;
-/* unary NOT search TERM here .. */
+extraTerms:
+SIMPLE_STRING extraTerms {
+ struct cql_node *st = cql_node_mk_sc(((CQL_parser) parm)->nmem,
+ /* index */ 0, /* rel */ 0, $1.buf);
+ st->u.st.extra_terms = $2.cql;
+ $$.cql = st;
+}
+|
+{ $$.cql = 0; }
+;
+
-boolean:
+/* unary NOT search SIMPLE_STRING here .. */
+
+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);
@@
-150,7
+188,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);
@@
-159,47
+197,34
@@
modifiers '/' searchTerm mrelation searchTerm
$$.cql = mod;
}
|
$$.cql = mod;
}
|
-{
+{
$$.cql = 0;
}
;
$$.cql = 0;
}
;
-/*
-extraTerms:
- extraTerms TERM | ;
-*/
-
-mrelation:
- '='
-| '>'
-| '<'
-| GE
-| LE
-| NE
-| EXACT
-;
+relation: PREFIX_NAME | relation_symbol;
-relation:
- '='
-| '>'
+relation_symbol:
+ '='
+| '>'
| '<'
| GE
| LE
| NE
| EXACT
| '<'
| GE
| LE
| NE
| EXACT
-| DOTTERM
;
;
-index:
+index:
searchTerm;
searchTerm:
searchTerm;
searchTerm:
- TERM
-| DOTTERM
+ SIMPLE_STRING
+| PREFIX_NAME
| AND
| OR
| NOT
| PROX
| AND
| OR
| NOT
| PROX
+| SORTBY
;
%%
;
%%
@@
-221,7
+246,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)
@@
-251,7
+276,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;
@@
-310,7
+335,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
{
@@
-355,14
+380,23
@@
int yylex(YYSTYPE *lval, void *vp)
lval->buf = "prox";
return PROX;
}
lval->buf = "prox";
return PROX;
}
+ if (!cql_strcmp(lval->buf, "sortby"))
+ {
+ lval->buf = "sortby";
+ return SORTBY;
+ }
+ if (cp->strict)
+ return PREFIX_NAME;
if (!cql_strcmp(lval->buf, "all"))
relation_like = 1;
if (!cql_strcmp(lval->buf, "any"))
relation_like = 1;
if (!cql_strcmp(lval->buf, "all"))
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;
}
}
@@
-375,8
+409,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;
@@
-385,7
+418,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;
@@
-394,6
+427,7
@@
CQL_parser cql_parser_create(void)
cp->last_error = 0;
cp->last_pos = 0;
cp->nmem = nmem_create();
cp->last_error = 0;
cp->last_pos = 0;
cp->nmem = nmem_create();
+ cp->strict = 0;
return cp;
}
return cp;
}
@@
-408,3
+442,17
@@
struct cql_node *cql_parser_result(CQL_parser cp)
{
return cp->top;
}
{
return cp->top;
}
+
+void cql_parser_strict(CQL_parser cp, int mode)
+{
+ cp->strict = mode;
+}
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */