From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 5 Nov 2015 11:29:53 +0000 (+0100)
Subject: Update cql.y for newer bison YAZ-720
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=refs%2Fheads%2Fyaz3;p=yaz-moved-to-github.git

Update cql.y for newer bison YAZ-720
---

diff --git a/src/cql.y b/src/cql.y
index 25a4287..7ab6be7 100644
--- a/src/cql.y
+++ b/src/cql.y
@@ -45,14 +45,13 @@
 
 #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(char *lval, char *msg);
 %}
 
-%pure_parser
+%lex-param {void *parm}
+%parse-param {void *parm}
+%pure-parser
 %token DOTTERM TERM AND OR NOT PROX GE LE NE EXACT SORTBY
 
 %%
@@ -216,7 +215,7 @@ searchTerm:
 
 %%
 
-int yyerror(char *s)
+int yyerror(char *locp, char *s)
 {
     return 0;
 }