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
Added GCC option -Wstrict-prototypes to buildconf.sh -d. Updated code
[yaz-moved-to-github.git]
/
src
/
cql.y
diff --git
a/src/cql.y
b/src/cql.y
index
d2cc5c5
..
b5077d3
100644
(file)
--- a/
src/cql.y
+++ b/
src/cql.y
@@
-1,4
+1,4
@@
-/* $Id: cql.y,v 1.6 2004-10-03 22:34:07 adam Exp $
+/* $Id: cql.y,v 1.9 2005-06-27 22:03:59 adam Exp $
Copyright (C) 2002-2004
Index Data Aps
Copyright (C) 2002-2004
Index Data Aps
@@
-14,6
+14,7
@@
See the file LICENSE.
* \brief Implements CQL parser.
*
* This is a YACC parser, but since it must be reentrant, Bison is required.
* \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 <stdio.h>
#include <stdlib.h>
*/
#include <stdio.h>
#include <stdlib.h>
@@
-22,12
+23,18
@@
See the file LICENSE.
#include <yaz/xmalloc.h>
#include <yaz/nmem.h>
#include <yaz/cql.h>
#include <yaz/xmalloc.h>
#include <yaz/nmem.h>
#include <yaz/cql.h>
-
+
+ /** Node in the LALR parse tree. */
typedef struct {
typedef struct {
+ /** Inhereted attribute: relation */
struct cql_node *rel;
struct cql_node *rel;
+ /** Synthesized attribute: CQL node */
struct cql_node *cql;
struct cql_node *cql;
+ /** string buffer with token */
char *buf;
char *buf;
+ /** length of token */
size_t len;
size_t len;
+ /** size of buffer (len <= size) */
size_t size;
} token;
size_t size;
} token;
@@
-57,7
+64,8
@@
See the file LICENSE.
%%
top: {
%%
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);
((CQL_parser) parm)->top = 0;
} cqlQuery1 {
cql_node_destroy($$.rel);
@@
-78,7
+86,8
@@
cqlQuery:
cqlQuery boolean modifiers {
$$.rel = $0.rel;
} searchClause {
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;
cn->u.boolean.modifiers = $3.cql;
cn->u.boolean.left = $1.cql;
@@
-97,13
+106,13
@@
searchClause:
}
|
searchTerm {
}
|
searchTerm {
- struct cql_node *st = cql_node_dup ($0.rel);
- st->u.st.term = xstrdup($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 {
$$.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;
$$.rel->u.st.modifiers = $3.cql;
} searchClause {
$$.cql = $5.cql;
@@
-112,12
+121,14
@@
searchClause:
| '>' searchTerm '=' searchTerm {
$$.rel = $0.rel;
} cqlQuery {
| '>' searchTerm '=' searchTerm {
$$.rel = $0.rel;
} cqlQuery {
- $$.cql = cql_apply_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 {
}
| '>' searchTerm {
$$.rel = $0.rel;
} cqlQuery {
- $$.cql = cql_apply_prefix($4.cql, 0, $2.buf);
+ $$.cql = cql_apply_prefix(((CQL_parser) parm)->nmem,
+ $4.cql, 0, $2.buf);
}
;
}
;
@@
-129,7
+140,8
@@
boolean:
modifiers: modifiers '/' searchTerm
{
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;
mod->u.st.modifiers = $1.cql;
$$.cql = mod;
@@
-137,7
+149,8
@@
modifiers: modifiers '/' searchTerm
|
modifiers '/' searchTerm mrelation 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;
mod->u.st.modifiers = $1.cql;
$$.cql = mod;
@@
-185,8
+198,10
@@
int yyerror(char *s)
return 0;
}
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)
*/
static void putb(YYSTYPE *lval, CQL_parser cp, int c)
@@
-204,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;
int yylex(YYSTYPE *lval, void *vp)
{
CQL_parser cp = (CQL_parser) vp;
@@
-280,13
+299,13
@@
int yylex(YYSTYPE *lval, void *vp)
#endif
if (c != 0)
cp->ungetbyte(c, cp->client_data);
#endif
if (c != 0)
cp->ungetbyte(c, cp->client_data);
- if (!strcmp(lval->buf, "and"))
+ if (!cql_strcmp(lval->buf, "and"))
return AND;
return AND;
- if (!strcmp(lval->buf, "or"))
+ if (!cql_strcmp(lval->buf, "or"))
return OR;
return OR;
- if (!strcmp(lval->buf, "not"))
+ if (!cql_strcmp(lval->buf, "not"))
return NOT;
return NOT;
- if (!strncmp(lval->buf, "prox", 4))
+ if (!cql_strcmp(lval->buf, "prox"))
return PROX;
}
return TERM;
return PROX;
}
return TERM;