X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fcql.y;h=67e2f761809ea7c6b9ca24053cd28515e831659e;hp=b5077d3b6f9924af15225408f02d63880d7ffead;hb=9084e20f4c5ffad9cfea2087396206b75a3a6654;hpb=f9828584ad6d0f66eb85b2e6d8bca5a29d569dcb diff --git a/src/cql.y b/src/cql.y index b5077d3..67e2f76 100644 --- a/src/cql.y +++ b/src/cql.y @@ -1,25 +1,23 @@ -/* $Id: cql.y,v 1.9 2005-06-27 22:03:59 adam Exp $ - Copyright (C) 2002-2004 - 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. */ +#if HAVE_CONFIG_H +#include +#endif #include #include #include -#include +#include #include #include #include @@ -36,7 +34,7 @@ See the file LICENSE. size_t len; /** size of buffer (len <= size) */ size_t size; - } token; + } token; struct cql_parser { int (*getbyte)(void *client_data); @@ -49,30 +47,55 @@ See the file LICENSE. }; #define YYSTYPE token - + #define YYPARSE_PARAM parm #define YYLEX_PARAM parm - + int yylex(YYSTYPE *lval, void *vp); int yyerror(char *s); %} %pure_parser -%token TERM AND OR NOT PROX GE LE NE -%expect 9 +%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", "scr", 0); + "cql.serverChoice", "=", 0); ((CQL_parser) parm)->top = 0; -} cqlQuery1 { +} 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 */ + { $$.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); @@ -80,15 +103,32 @@ cqlQuery1: cqlQuery } ; -cqlQuery: +cqlQuery: + scopedClause + | + '>' searchTerm '=' searchTerm { + $$.rel = $0.rel; + } cqlQuery { + $$.cql = cql_apply_prefix(((CQL_parser) parm)->nmem, + $6.cql, $2.buf, $4.buf); + } +| '>' searchTerm { + $$.rel = $0.rel; + } cqlQuery { + $$.cql = cql_apply_prefix(((CQL_parser) parm)->nmem, + $4.cql, 0, $2.buf); + } +; + +scopedClause: searchClause | - cqlQuery 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; @@ -97,20 +137,21 @@ cqlQuery: } ; -searchClause: - '(' { +searchClause: + '(' { $$.rel = $0.rel; - + } cqlQuery ')' { $$.cql = $3.cql; } | - searchTerm { - struct cql_node *st = cql_node_dup (((CQL_parser) parm)->nmem, $0.rel); +searchTerm { + struct cql_node *st = cql_node_dup(((CQL_parser) parm)->nmem, $0.rel); 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; @@ -118,36 +159,23 @@ searchClause: $$.cql = $5.cql; cql_node_destroy($4.rel); } -| '>' searchTerm '=' searchTerm { - $$.rel = $0.rel; - } cqlQuery { - $$.cql = cql_apply_prefix(((CQL_parser) parm)->nmem, - $6.cql, $2.buf, $4.buf); - } -| '>' searchTerm { - $$.rel = $0.rel; - } cqlQuery { - $$.cql = cql_apply_prefix(((CQL_parser) parm)->nmem, - $4.cql, 0, $2.buf); - } ; -/* unary NOT search TERM here .. */ +/* unary NOT search SIMPLE_STRING here .. */ -boolean: - AND | OR | NOT | PROX - ; +boolean: + AND | OR | NOT | PROX ; modifiers: modifiers '/' searchTerm -{ +{ struct cql_node *mod = cql_node_mk_sc(((CQL_parser)parm)->nmem, - $3.buf, "=", 0); + $3.buf, 0, 0); mod->u.st.modifiers = $1.cql; $$.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); @@ -156,39 +184,33 @@ modifiers '/' searchTerm mrelation searchTerm $$.cql = mod; } | -{ +{ $$.cql = 0; } ; -mrelation: - '=' -| '>' -| '<' -| GE -| LE -| NE -; +relation: SIMPLE_STRING | relation_symbol; -relation: - '=' -| '>' +relation_symbol: + '=' +| '>' | '<' | GE | LE | NE -| TERM +| EXACT ; -index: +index: searchTerm; searchTerm: - TERM + SIMPLE_STRING | AND | OR | NOT | PROX +| SORTBY ; %% @@ -210,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)); - memcpy (nb, lval->buf, lval->len); + memcpy(nb, lval->buf, lval->len); lval->buf = nb; } if (c) @@ -240,12 +262,23 @@ int yylex(YYSTYPE *lval, void *vp) return 0; if (c == '\n') return 0; - } while (isspace(c)); + } while (yaz_isspace(c)); if (strchr("()=>') + if (c == '=') + { + c1 = cp->getbyte(cp->client_data); + if (c1 == '=') + { + putb(lval, cp, c1); + return EXACT; + } + else + cp->ungetbyte(c1, cp->client_data); + } + else if (c == '>') { c1 = cp->getbyte(cp->client_data); if (c1 == '=') @@ -279,36 +312,64 @@ int yylex(YYSTYPE *lval, void *vp) while ((c = cp->getbyte(cp->client_data)) != 0 && c != '"') { if (c == '\\') + { + putb(lval, cp, c); c = cp->getbyte(cp->client_data); - putb(lval, cp, c); + if (!c) + break; + } + putb(lval, cp, c); } putb(lval, cp, 0); + return SIMPLE_STRING; } else { - putb(lval, cp, c); - while ((c = cp->getbyte(cp->client_data)) != 0 && - !strchr(" \n()=<>/", c)) - { - if (c == '\\') - c = cp->getbyte(cp->client_data); - putb(lval, cp, c); - } + while (c != 0 && !strchr(" \n()=<>/", c)) + { + if (c == '\\') + { + putb(lval, cp, c); + c = cp->getbyte(cp->client_data); + if (!c) + break; + } + putb(lval, cp, c); + c = cp->getbyte(cp->client_data); + } + putb(lval, cp, 0); #if YYDEBUG - printf ("got %s\n", lval->buf); + printf ("got %s\n", lval->buf); #endif - if (c != 0) - cp->ungetbyte(c, cp->client_data); - if (!cql_strcmp(lval->buf, "and")) - return AND; - if (!cql_strcmp(lval->buf, "or")) - return OR; - if (!cql_strcmp(lval->buf, "not")) - return NOT; - if (!cql_strcmp(lval->buf, "prox")) - return PROX; + if (c != 0) + cp->ungetbyte(c, cp->client_data); + if (!cql_strcmp(lval->buf, "and")) + { + lval->buf = "and"; + return AND; + } + if (!cql_strcmp(lval->buf, "or")) + { + lval->buf = "or"; + return OR; + } + if (!cql_strcmp(lval->buf, "not")) + { + lval->buf = "not"; + return NOT; + } + if (!cql_strcmp(lval->buf, "prox")) + { + lval->buf = "prox"; + return PROX; + } + if (!cql_strcmp(lval->buf, "sortby")) + { + lval->buf = "sortby"; + return SORTBY; + } } - return TERM; + return SIMPLE_STRING; } @@ -321,8 +382,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; @@ -331,7 +391,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; @@ -354,3 +414,12 @@ struct cql_node *cql_parser_result(CQL_parser cp) { return cp->top; } + +/* + * Local variables: + * c-basic-offset: 4 + * c-file-style: "Stroustrup" + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */