Update cql.y for newer bison YAZ-720

[yaz-moved-to-github.git] / src / cql.y

diff --git a/src/cql.y b/src/cql.y
index 4021373..cf85690 100644 (file)
--- a/src/cql.y
+++ b/src/cql.y
@@ -1,10 +1,10 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
- */ 
+ */
 /* bison parser for CQL grammar. */
 %{
-/** 
+/**
  * \file cql.c
  * \brief Implements CQL parser.
  *
@@ -34,7 +34,7 @@
         size_t len;
        /** size of buffer (len <= size) */
         size_t size;
-    } token;        
+    } token;
 
     struct cql_parser {
         int (*getbyte)(void *client_data);
@@ -44,23 +44,25 @@
         int last_pos;
         struct cql_node *top;
         NMEM nmem;
+        int strict;
     };
 
 #define YYSTYPE token
-    
-#define YYPARSE_PARAM parm
-#define YYLEX_PARAM parm
-    
-    int yylex(YYSTYPE *lval, void *vp);
-    int yyerror(char *s);
+
+int yylex(YYSTYPE *lval, void *vp);
+int yyerror(void *lval, char *msg);
+
 %}
 
-%pure_parser
-%token DOTTERM TERM AND OR NOT PROX GE LE NE EXACT SORTBY
+
+%lex-param {void *parm}
+%parse-param {void *parm}
+%pure-parser
+%token PREFIX_NAME SIMPLE_STRING AND OR NOT PROX GE LE NE EXACT SORTBY
 
 %%
 
-top: { 
+top: {
     $$.rel = cql_node_mk_sc(((CQL_parser) parm)->nmem,
                            "cql.serverChoice", "=", 0);
     ((CQL_parser) parm)->top = 0;
@@ -89,7 +91,7 @@ sortSpec: sortSpec singleSpec {
 | singleSpec
 {
     $$.cql = $1.cql;
-}; 
+};
 
 singleSpec: index modifiers {
     $$.cql = cql_node_mk_sort(((CQL_parser) parm)->nmem, $1.buf, $2.cql);
@@ -115,20 +117,20 @@ cqlQuery:
 | '>' searchTerm {
       $$.rel = $0.rel;
   } cqlQuery {
-    $$.cql = cql_apply_prefix(((CQL_parser) parm)->nmem, 
+    $$.cql = cql_apply_prefix(((CQL_parser) parm)->nmem,
                              $4.cql, 0, $2.buf);
    }
 ;
 
-scopedClause: 
+scopedClause:
   searchClause
 |
-  scopedClause 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;
@@ -137,10 +139,10 @@ scopedClause:
   }
 ;
 
-searchClause: 
-  '(' { 
+searchClause:
+  '(' {
       $$.rel = $0.rel;
-      
+
   } cqlQuery ')' {
       $$.cql = $3.cql;
   }
@@ -151,7 +153,7 @@ searchTerm extraTerms {
       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;
@@ -162,24 +164,24 @@ searchTerm extraTerms {
 ;
 
 extraTerms:
-extraTerms TERM {
-    struct cql_node *st = cql_node_mk_sc(((CQL_parser) parm)->nmem, 
-                                        /* index */ 0, /* rel */ 0, $2.buf);
-    st->u.st.extra_terms = $1.cql;
+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 TERM here .. */
+/* unary NOT search SIMPLE_STRING here .. */
 
-boolean: 
+boolean:
   AND | OR | NOT | PROX ;
 
 modifiers: modifiers '/' searchTerm
-{ 
+{
     struct cql_node *mod = cql_node_mk_sc(((CQL_parser)parm)->nmem,
                                          $3.buf, 0, 0);
 
@@ -187,7 +189,7 @@ modifiers: modifiers '/' searchTerm
     $$.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);
@@ -196,38 +198,29 @@ modifiers '/' searchTerm mrelation searchTerm
     $$.cql = mod;
 }
 |
-{ 
+{
     $$.cql = 0;
 }
 ;
 
-mrelation:
-  '=' 
-| '>' 
-| '<'
-| GE
-| LE
-| NE
-| EXACT
-;
+relation: PREFIX_NAME | relation_symbol;
 
-relation: 
-  '=' 
-| '>' 
+relation_symbol:
+  '='
+| '>'
 | '<'
 | GE
 | LE
 | NE
 | EXACT
-| DOTTERM
 ;
 
-index: 
+index:
   searchTerm;
 
 searchTerm:
-  TERM
-| DOTTERM
+  SIMPLE_STRING
+| PREFIX_NAME
 | AND
 | OR
 | NOT
@@ -237,7 +230,7 @@ searchTerm:
 
 %%
 
-int yyerror(char *s)
+int yyerror(void *locp, char *s)
 {
     return 0;
 }
@@ -254,7 +247,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)
@@ -343,7 +336,7 @@ int yylex(YYSTYPE *lval, void *vp)
            putb(lval, cp, c);
         }
         putb(lval, cp, 0);
-       return TERM;
+       return SIMPLE_STRING;
     }
     else
     {
@@ -393,14 +386,18 @@ int yylex(YYSTYPE *lval, void *vp)
            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 DOTTERM;
+           return PREFIX_NAME;
     }
-    return TERM;
+    return SIMPLE_STRING;
 }
 
 
@@ -422,7 +419,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;
@@ -431,6 +428,7 @@ CQL_parser cql_parser_create(void)
     cp->last_error = 0;
     cp->last_pos = 0;
     cp->nmem = nmem_create();
+    cp->strict = 0;
     return cp;
 }
 
@@ -446,6 +444,11 @@ struct cql_node *cql_parser_result(CQL_parser cp)
     return cp->top;
 }
 
+void cql_parser_strict(CQL_parser cp, int mode)
+{
+    cp->strict = mode;
+}
+
 /*
  * Local variables:
  * c-basic-offset: 4