From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 9 Jan 2014 15:20:44 +0000 (+0100)
Subject: Update cql.y for newer bison YAZ-720
X-Git-Tag: v5.0.11~13
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=b111819a3d4c8dea01efe2c12ef21689ea0c21ed;p=yaz-moved-to-github.git

Update cql.y for newer bison YAZ-720

The important part is that YYLEX_PARAM and YYPARSE_PARAM are no
longer supported. Instead one must use %lex-param and %parse-param .
---

diff --git a/src/cql.y b/src/cql.y
index 0757724..cf85690 100644
--- a/src/cql.y
+++ b/src/cql.y
@@ -49,14 +49,15 @@
 
 #define YYSTYPE token
 
-#define YYPARSE_PARAM parm
-#define YYLEX_PARAM parm
+int yylex(YYSTYPE *lval, void *vp);
+int yyerror(void *lval, char *msg);
 
-    int yylex(YYSTYPE *lval, void *vp);
-    int yyerror(char *s);
 %}
 
-%pure_parser
+
+%lex-param {void *parm}
+%parse-param {void *parm}
+%pure-parser
 %token PREFIX_NAME SIMPLE_STRING AND OR NOT PROX GE LE NE EXACT SORTBY
 
 %%
@@ -229,7 +230,7 @@ searchTerm:
 
 %%
 
-int yyerror(char *s)
+int yyerror(void *locp, char *s)
 {
     return 0;
 }