More type casts. Modify CQL tree - bool is C++ reserved name.

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

diff --git a/cql/cql.y b/cql/cql.y
index 4a816aa..582be81 100644 (file)
--- a/cql/cql.y
+++ b/cql/cql.y
@@ -1,4 +1,4 @@
-/* $Id: cql.y,v 1.1 2003-01-06 08:20:27 adam Exp $
+/* $Id: cql.y,v 1.3 2003-02-14 18:49:23 adam Exp $
    Copyright (C) 2002-2003
    Index Data Aps
 
@@ -71,9 +71,9 @@ cqlQuery:
   } searchClause {
       struct cql_node *cn = cql_node_mk_boolean($2.buf);
       
-      cn->u.bool.modifiers = $2.rel;
-      cn->u.bool.left = $1.cql;
-      cn->u.bool.right = $4.cql;
+      cn->u.boolean.modifiers = $2.rel;
+      cn->u.boolean.left = $1.cql;
+      cn->u.boolean.right = $4.cql;
 
       $$.cql = cn;
   }
@@ -98,7 +98,7 @@ searchClause:
       $$.rel->u.st.index = strdup($1.buf);
   } searchClause {
       $$.cql = $4.cql;
-      cql_node_destroy($$.rel);
+      cql_node_destroy($2.rel);
   }
 | '>' searchTerm '=' searchTerm {
       $$.rel = $0.rel;
@@ -250,7 +250,7 @@ int cql_parser_stream(CQL_parser cp,
 
 CQL_parser cql_parser_create(void)
 {
-    CQL_parser cp = malloc (sizeof(*cp));
+    CQL_parser cp = (CQL_parser) malloc (sizeof(*cp));
 
     return cp;
 }