discover/grub2: Fixes for bison 3.x

YYLEX_PARAM is removed in bison 3.0, so we need to pass the scanner
param directly through yyparse (rather than referencing
parser->scanner). Unfortunately, we don't have the lexer header
available at the time we declare yyparse, so we need to pass a void *
here.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/discover/grub2/grub2.c b/discover/grub2/grub2.c
index 7f63c351eedb25f2e161730fa26fb5a665de219f..5b3009a465f7d43ac8f351c00aac7b1075fbd24b 100644 (file)
--- a/discover/grub2/grub2.c
+++ b/discover/grub2/grub2.c
@@ -1,5 +1,6 @@
 
 #include <assert.h>
+#include <string.h>
 
 #include <talloc/talloc.h>
 #include <url/url.h>
@@ -9,8 +10,6 @@
 #include <discover/parser-utils.h>
 
 #include "grub2.h"
-#include "parser.h"
-#include "lexer.h"
 
 static const char *const grub2_conf_files[] = {
        "/grub.cfg",

diff --git a/discover/grub2/parser.y b/discover/grub2/parser.y
index 5a4d4f8e204a97181396ee8ea9800a56113b313f..0beddd6fc3e28252af96acb74cd12a34a0186ebd 100644 (file)
--- a/discover/grub2/parser.y
+++ b/discover/grub2/parser.y
@@ -2,6 +2,7 @@
 %pure-parser
 %lex-param { yyscan_t scanner }
 %parse-param { struct grub2_parser *parser }
+%parse-param { void *scanner }
 %error-verbose
 
 %{
@@ -9,10 +10,6 @@
 #include <log/log.h>
 
 #include "grub2.h"
-#include "parser.h"
-#include "lexer.h"
-
-#define YYLEX_PARAM parser->scanner
 
 void yyerror(struct grub2_parser *parser, const char *fmt, ...);
 %}
@@ -63,6 +60,10 @@ void yyerror(struct grub2_parser *parser, const char *fmt, ...);
 %start script
 %debug
 
+%{
+#include "lexer.h"
+%}
+
 %%
 
 script:        statements {
@@ -314,7 +315,7 @@ void grub2_parser_parse(struct grub2_parser *parser, const char *filename,
        bufstate = yy_scan_bytes(buf, len - 1, parser->scanner);
        yyset_lineno(1, parser->scanner);
 
-       rc = yyparse(parser);
+       rc = yyparse(parser, parser->scanner);
 
        yy_delete_buffer(bufstate, parser->scanner);