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://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=refs%2Fheads%2Fyaz2

Update cql.y for newer bison YAZ-720

Conflicts:
	src/cql.y
---

diff --git a/src/cql.y b/src/cql.y
index 187cba1..fbaaed3 100644
--- a/src/cql.y
+++ b/src/cql.y
@@ -50,16 +50,15 @@ See the file LICENSE.
 
 #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
-%token TERM AND OR NOT PROX GE LE NE
 %expect 9
+%lex-param {void *parm}
+%parse-param {void *parm}
+%pure-parser
+%token TERM AND OR NOT PROX GE LE NE
 
 %%
 
@@ -192,7 +191,7 @@ searchTerm:
 
 %%
 
-int yyerror(char *s)
+int yyerror(char *locp, char *s)
 {
     return 0;
 }