-/* $Id: cql.y,v 1.2 2004-03-10 16:34:29 adam Exp $
+/* $Id: cql.y,v 1.6 2004-10-03 22:34:07 adam Exp $
Copyright (C) 2002-2004
Index Data Aps
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.
+ */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
+#include <yaz/xmalloc.h>
#include <yaz/nmem.h>
#include <yaz/cql.h>
|
searchTerm {
struct cql_node *st = cql_node_dup ($0.rel);
- st->u.st.term = strdup($1.buf);
+ st->u.st.term = xstrdup($1.buf);
$$.cql = st;
}
|
| '>' searchTerm '=' searchTerm {
$$.rel = $0.rel;
} cqlQuery {
- $$.cql = cql_node_prefix($6.cql, $2.buf, $4.buf);
+ $$.cql = cql_apply_prefix($6.cql, $2.buf, $4.buf);
}
| '>' searchTerm {
$$.rel = $0.rel;
} cqlQuery {
- $$.cql = cql_node_prefix($4.cql, 0, $2.buf);
+ $$.cql = cql_apply_prefix($4.cql, 0, $2.buf);
}
;
{
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;
}
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
{
}
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);
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;
{
cql_node_destroy(cp->top);
nmem_destroy(cp->nmem);
- free (cp);
+ xfree (cp);
}
struct cql_node *cql_parser_result(CQL_parser cp)