projects
/
yaz-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
98dabce
)
Update cql.y for newer bison YAZ-720
yaz2
author
Adam Dickmeiss
<adam@indexdata.dk>
Thu, 5 Nov 2015 11:29:53 +0000
(12:29 +0100)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Thu, 5 Nov 2015 11:38:08 +0000
(12:38 +0100)
Conflicts:
src/cql.y
src/cql.y
patch
|
blob
|
history
diff --git
a/src/cql.y
b/src/cql.y
index
187cba1
..
fbaaed3
100644
(file)
--- a/
src/cql.y
+++ b/
src/cql.y
@@
-50,16
+50,15
@@
See the file LICENSE.
#define YYSTYPE token
#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
%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;
}
{
return 0;
}