From fb746266c2b2d4326d2d2a5e67a9db9bd5a6f8e0 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 5 Nov 2015 12:29:53 +0100 Subject: [PATCH 1/1] Update cql.y for newer bison YAZ-720 Conflicts: src/cql.y --- src/cql.y | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) 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; } -- 1.7.10.4