X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fgrub2%2Fparser.y;h=0beddd6fc3e28252af96acb74cd12a34a0186ebd;hb=350ef03d554a4c8f67e22bdf89fa888554f0b75e;hp=a3473ca9051100df47bbe96a0062c6d9699e688c;hpb=bd5c147d5e39a10469876048df12348dc556c20c;p=petitboot

diff --git a/discover/grub2/parser.y b/discover/grub2/parser.y
index a3473ca..0beddd6 100644
--- 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 {
@@ -303,15 +304,18 @@ struct grub2_parser *grub2_parser_create(struct discover_context *ctx)
 	return parser;
 }
 
-void grub2_parser_parse(struct grub2_parser *parser, char *buf, int len)
+void grub2_parser_parse(struct grub2_parser *parser, const char *filename,
+		char *buf, int len)
 {
 	YY_BUFFER_STATE bufstate;
 	int rc;
 
+	parser->script->filename = 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);