X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fcql.y;h=f4293e734ea9cc1c3180faa5e5be05f3243239ae;hp=0a817388a37d4beecf19120fee1a67c7872624e4;hb=e4368af2ede9079d33e7a8fd280d29b2bde1d1ad;hpb=42f18e58ed67f77727cde23bcee44dbd32ed242a diff --git a/src/cql.y b/src/cql.y index 0a81738..f4293e7 100644 --- a/src/cql.y +++ b/src/cql.y @@ -1,6 +1,6 @@ -/* $Id: cql.y,v 1.2 2004-03-10 16:34:29 adam Exp $ - Copyright (C) 2002-2004 - Index Data Aps +/* $Id: cql.y,v 1.11 2006-10-05 16:19:16 adam Exp $ + Copyright (C) 2002-2006 + Index Data ApS This file is part of the YAZ toolkit. @@ -9,18 +9,32 @@ See the file LICENSE. 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. + */ #include #include #include #include +#include #include #include - + + /** Node in the LALR parse tree. */ typedef struct { + /** Inhereted attribute: relation */ struct cql_node *rel; + /** Synthesized attribute: CQL node */ struct cql_node *cql; + /** string buffer with token */ char *buf; + /** length of token */ size_t len; + /** size of buffer (len <= size) */ size_t size; } token; @@ -50,7 +64,8 @@ See the file LICENSE. %% top: { - $$.rel = cql_node_mk_sc("cql.serverChoice", "scr", 0); + $$.rel = cql_node_mk_sc(((CQL_parser) parm)->nmem, + "cql.serverChoice", "scr", 0); ((CQL_parser) parm)->top = 0; } cqlQuery1 { cql_node_destroy($$.rel); @@ -71,7 +86,8 @@ cqlQuery: cqlQuery boolean modifiers { $$.rel = $0.rel; } searchClause { - struct cql_node *cn = cql_node_mk_boolean($2.buf); + 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; @@ -90,13 +106,13 @@ searchClause: } | searchTerm { - struct cql_node *st = cql_node_dup ($0.rel); - st->u.st.term = strdup($1.buf); + 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($1.buf, $2.buf, 0); + $$.rel = cql_node_mk_sc(((CQL_parser) parm)->nmem, $1.buf, $2.buf, 0); $$.rel->u.st.modifiers = $3.cql; } searchClause { $$.cql = $5.cql; @@ -105,12 +121,14 @@ searchClause: | '>' searchTerm '=' searchTerm { $$.rel = $0.rel; } cqlQuery { - $$.cql = cql_node_prefix($6.cql, $2.buf, $4.buf); + $$.cql = cql_apply_prefix(((CQL_parser) parm)->nmem, + $6.cql, $2.buf, $4.buf); } | '>' searchTerm { $$.rel = $0.rel; } cqlQuery { - $$.cql = cql_node_prefix($4.cql, 0, $2.buf); + $$.cql = cql_apply_prefix(((CQL_parser) parm)->nmem, + $4.cql, 0, $2.buf); } ; @@ -122,7 +140,8 @@ boolean: modifiers: modifiers '/' searchTerm { - struct cql_node *mod = cql_node_mk_sc($3.buf, "=", 0); + struct cql_node *mod = cql_node_mk_sc(((CQL_parser)parm)->nmem, + $3.buf, "=", 0); mod->u.st.modifiers = $1.cql; $$.cql = mod; @@ -130,7 +149,8 @@ modifiers: modifiers '/' searchTerm | modifiers '/' searchTerm mrelation searchTerm { - struct cql_node *mod = cql_node_mk_sc($3.buf, $4.buf, $5.buf); + struct cql_node *mod = cql_node_mk_sc(((CQL_parser)parm)->nmem, + $3.buf, $4.buf, $5.buf); mod->u.st.modifiers = $1.cql; $$.cql = mod; @@ -178,15 +198,18 @@ int yyerror(char *s) return 0; } -/* - * bison lexer for CQL. +/** + * putb is a utility that puts one character to the string + * in current lexical token. This routine deallocates as + * necessary using NMEM. */ static void putb(YYSTYPE *lval, CQL_parser cp, int c) { if (lval->len+1 >= lval->size) { - char *nb = 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); lval->buf = nb; } @@ -196,6 +219,10 @@ static void putb(YYSTYPE *lval, CQL_parser cp, int c) } +/** + * yylex returns next token for Bison to be read. In this + * case one of the CQL terminals are returned. + */ int yylex(YYSTYPE *lval, void *vp) { CQL_parser cp = (CQL_parser) vp; @@ -204,7 +231,7 @@ int yylex(YYSTYPE *lval, void *vp) lval->rel = 0; lval->len = 0; lval->size = 10; - lval->buf = nmem_malloc(cp->nmem, lval->size); + lval->buf = (char *) nmem_malloc(cp->nmem, lval->size); lval->buf[0] = '\0'; do { @@ -249,7 +276,7 @@ int yylex(YYSTYPE *lval, void *vp) } if (c == '"') { - while ((c = cp->getbyte(cp->client_data)) != EOF && c != '"') + while ((c = cp->getbyte(cp->client_data)) != 0 && c != '"') { if (c == '\\') c = cp->getbyte(cp->client_data); @@ -259,26 +286,25 @@ int yylex(YYSTYPE *lval, void *vp) } else { - putb(lval, cp, c); - while ((c = cp->getbyte(cp->client_data)) != 0 && - !strchr(" \n()=<>/", c)) + while (c != 0 && !strchr(" \n()=<>/", c)) { if (c == '\\') c = cp->getbyte(cp->client_data); putb(lval, cp, c); + c = cp->getbyte(cp->client_data); } #if YYDEBUG printf ("got %s\n", lval->buf); #endif if (c != 0) cp->ungetbyte(c, cp->client_data); - if (!strcmp(lval->buf, "and")) + if (!cql_strcmp(lval->buf, "and")) return AND; - if (!strcmp(lval->buf, "or")) + if (!cql_strcmp(lval->buf, "or")) return OR; - if (!strcmp(lval->buf, "not")) + if (!cql_strcmp(lval->buf, "not")) return NOT; - if (!strncmp(lval->buf, "prox", 4)) + if (!cql_strcmp(lval->buf, "prox")) return PROX; } return TERM; @@ -304,7 +330,7 @@ int cql_parser_stream(CQL_parser cp, CQL_parser cql_parser_create(void) { - CQL_parser cp = (CQL_parser) malloc (sizeof(*cp)); + CQL_parser cp = (CQL_parser) xmalloc (sizeof(*cp)); cp->top = 0; cp->getbyte = 0; @@ -320,7 +346,7 @@ void cql_parser_destroy(CQL_parser cp) { cql_node_destroy(cp->top); nmem_destroy(cp->nmem); - free (cp); + xfree (cp); } struct cql_node *cql_parser_result(CQL_parser cp)