X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fcql.y;h=cf856906b2f971095203663bfdf077bfbc16f0e2;hp=7bb83f848af886f93cfa995d634cca7580a9d735;hb=b111819a3d4c8dea01efe2c12ef21689ea0c21ed;hpb=43a9d38d20c1b1bcd1a03b2445a501d27526bd35 diff --git a/src/cql.y b/src/cql.y index 7bb83f8..cf85690 100644 --- a/src/cql.y +++ b/src/cql.y @@ -1,10 +1,10 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2011 Index Data + * Copyright (C) Index Data * See the file LICENSE for details. - */ + */ /* bison parser for CQL grammar. */ %{ -/** +/** * \file cql.c * \brief Implements CQL parser. * @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include @@ -34,7 +34,7 @@ size_t len; /** size of buffer (len <= size) */ size_t size; - } token; + } token; struct cql_parser { int (*getbyte)(void *client_data); @@ -44,39 +44,59 @@ int last_pos; struct cql_node *top; NMEM nmem; + int strict; }; #define YYSTYPE token - -#define YYPARSE_PARAM parm -#define YYLEX_PARAM parm - - int yylex(YYSTYPE *lval, void *vp); - int yyerror(char *s); + +int yylex(YYSTYPE *lval, void *vp); +int yyerror(void *lval, char *msg); + %} -%pure_parser -%token DOTTERM TERM AND OR NOT PROX GE LE NE EXACT SORTBY + +%lex-param {void *parm} +%parse-param {void *parm} +%pure-parser +%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; } 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 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 { @@ -97,20 +117,20 @@ 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); } ; -scopedClause: +scopedClause: 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); - + cn->u.boolean.modifiers = $3.cql; cn->u.boolean.left = $1.cql; cn->u.boolean.right = $5.cql; @@ -119,10 +139,10 @@ scopedClause: } ; -searchClause: - '(' { +searchClause: + '(' { $$.rel = $0.rel; - + } cqlQuery ')' { $$.cql = $3.cql; } @@ -133,7 +153,7 @@ searchTerm extraTerms { 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; @@ -144,24 +164,24 @@ 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; +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; } ; -/* unary NOT search TERM here .. */ +/* unary NOT search SIMPLE_STRING here .. */ -boolean: +boolean: AND | OR | NOT | PROX ; modifiers: modifiers '/' searchTerm -{ +{ struct cql_node *mod = cql_node_mk_sc(((CQL_parser)parm)->nmem, $3.buf, 0, 0); @@ -169,7 +189,7 @@ modifiers: modifiers '/' searchTerm $$.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); @@ -178,38 +198,29 @@ modifiers '/' searchTerm mrelation searchTerm $$.cql = mod; } | -{ +{ $$.cql = 0; } ; -mrelation: - '=' -| '>' -| '<' -| GE -| LE -| NE -| EXACT -; +relation: PREFIX_NAME | relation_symbol; -relation: - '=' -| '>' +relation_symbol: + '=' +| '>' | '<' | GE | LE | NE | EXACT -| DOTTERM ; -index: +index: searchTerm; searchTerm: - TERM -| DOTTERM + SIMPLE_STRING +| PREFIX_NAME | AND | OR | NOT @@ -219,7 +230,7 @@ searchTerm: %% -int yyerror(char *s) +int yyerror(void *locp, char *s) { return 0; } @@ -236,7 +247,7 @@ static void putb(YYSTYPE *lval, CQL_parser cp, int c) { 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) @@ -266,7 +277,7 @@ int yylex(YYSTYPE *lval, void *vp) return 0; if (c == '\n') return 0; - } while (isspace(c)); + } while (yaz_isspace(c)); if (strchr("()=>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, "adj")) + relation_like = 1; if (relation_like) - return DOTTERM; + return PREFIX_NAME; } - return TERM; + return SIMPLE_STRING; } @@ -395,8 +410,7 @@ int cql_parser_stream(CQL_parser cp, 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; @@ -405,7 +419,7 @@ int cql_parser_stream(CQL_parser cp, 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; @@ -414,6 +428,7 @@ CQL_parser cql_parser_create(void) cp->last_error = 0; cp->last_pos = 0; cp->nmem = nmem_create(); + cp->strict = 0; return cp; } @@ -428,3 +443,17 @@ struct cql_node *cql_parser_result(CQL_parser cp) { 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 + */