/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2013 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
/* bison parser for CQL grammar. */
int last_pos;
struct cql_node *top;
NMEM nmem;
+ int strict;
};
#define YYSTYPE token
%}
%pure_parser
-%token SIMPLE_STRING AND OR NOT PROX GE LE NE EXACT SORTBY
+%token PREFIX_NAME SIMPLE_STRING AND OR NOT PROX GE LE NE EXACT SORTBY
%%
$$.cql = $3.cql;
}
|
-searchTerm {
+searchTerm extraTerms {
struct cql_node *st = cql_node_dup(((CQL_parser) parm)->nmem, $0.rel);
+ st->u.st.extra_terms = $2.cql;
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);
}
;
+extraTerms:
+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 SIMPLE_STRING here .. */
boolean:
}
;
-relation: SIMPLE_STRING | relation_symbol;
+relation: PREFIX_NAME | relation_symbol;
relation_symbol:
'='
searchTerm:
SIMPLE_STRING
+| PREFIX_NAME
| AND
| OR
| NOT
}
else
{
+ int relation_like = 0;
while (c != 0 && !strchr(" \n()=<>/", c))
{
+ if (c == '.')
+ relation_like = 1;
if (c == '\\')
{
putb(lval, cp, c);
lval->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 PREFIX_NAME;
}
return SIMPLE_STRING;
}
cp->last_error = 0;
cp->last_pos = 0;
cp->nmem = nmem_create();
+ cp->strict = 0;
return cp;
}
return cp->top;
}
+void cql_parser_strict(CQL_parser cp, int mode)
+{
+ cp->strict = mode;
+}
+
/*
* Local variables:
* c-basic-offset: 4