X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fgrub2%2Fparser.y;h=0beddd6fc3e28252af96acb74cd12a34a0186ebd;hp=6d3ff2117140dd9d4b3b8a1de7643fa1cd3429ac;hb=d6b11766acb4457457419a84f460a3ce7a8f4693;hpb=a33e7992485e95a60add27af37327dc9f0eb3a34

diff --git a/discover/grub2/parser.y b/discover/grub2/parser.y
index 6d3ff21..0beddd6 100644
--- a/discover/grub2/parser.y
+++ b/discover/grub2/parser.y
@@ -2,21 +2,16 @@
 %pure-parser
 %lex-param { yyscan_t scanner }
 %parse-param { struct grub2_parser *parser }
+%parse-param { void *scanner }
 %error-verbose
 
 %{
 #include <talloc/talloc.h>
+#include <log/log.h>
 
 #include "grub2.h"
-#include "parser.h"
-#include "lexer.h"
-
-static void print_token(FILE *fp, int type, YYSTYPE value);
 
-#define YYLEX_PARAM parser->scanner
-#define YYPRINT(f, t, v) print_token(f, t, v)
-
-static void yyerror(struct grub2_parser *, char const *s);
+void yyerror(struct grub2_parser *parser, const char *fmt, ...);
 %}
 
 %union {
@@ -65,6 +60,10 @@ static void yyerror(struct grub2_parser *, char const *s);
 %start	script
 %debug
 
+%{
+#include "lexer.h"
+%}
+
 %%
 
 script:	statements {
@@ -84,7 +83,9 @@ statements: /* empty */ {
 		$$ = $1;
 	}
 
-conditional: statement TOKEN_EOL "then" TOKEN_EOL statements {
+sep:	TOKEN_DELIM | TOKEN_EOL;
+
+conditional: statement TOKEN_EOL "then" sep statements {
 		$$ = create_statement_conditional(parser, $1, $5);
 	}
 
@@ -112,7 +113,7 @@ statement:
 	}
 	| "if" TOKEN_DELIM conditional
 		elifs
-		"else" TOKEN_EOL
+		"else" sep
 		statements
 		"fi" {
 		$$ = create_statement_if(parser, $3, $4, $7);
@@ -146,18 +147,17 @@ word:	TOKEN_WORD
 	}
 
 %%
-void yyerror(struct grub2_parser *parser, char const *s)
+void yyerror(struct grub2_parser *parser, const char *fmt, ...)
 {
-	fprintf(stderr, "%d: error: %s '%s'\n",
-			yyget_lineno(parser->scanner),
-			s, yyget_text(parser->scanner));
-}
+	const char *str;
+	va_list ap;
 
-static void print_token(FILE *fp, int type, YYSTYPE value)
-{
-	if (type != TOKEN_WORD)
-		return;
-	fprintf(fp, "%s", value.word->text);
+	va_start(ap, fmt);
+	str = talloc_vasprintf(parser, fmt, ap);
+	va_end(ap);
+
+	pb_log("parse error: %d('%s'): %s\n", yyget_lineno(parser->scanner),
+					yyget_text(parser->scanner), str);
 }
 
 struct grub2_statements *create_statements(struct grub2_parser *parser)
@@ -304,14 +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);