X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fgrub2%2Fparser.y;h=a3473ca9051100df47bbe96a0062c6d9699e688c;hb=089d0a6eb769d531129a7cd1061493a1a24b4bef;hp=3a5a142f57b106153c8915f011aa349b345d62e2;hpb=d1052291224febe931fc95ed53d5008f66a72b96;p=petitboot

diff --git a/discover/grub2/parser.y b/discover/grub2/parser.y
index 3a5a142..a3473ca 100644
--- a/discover/grub2/parser.y
+++ b/discover/grub2/parser.y
@@ -6,17 +6,15 @@
 
 %{
 #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 {
@@ -60,6 +58,7 @@ static void yyerror(struct grub2_parser *, char const *s);
 %token	TOKEN_EOL
 %token	TOKEN_DELIM
 %token	<word> TOKEN_WORD
+%token	TOKEN_EOF 0
 
 %start	script
 %debug
@@ -70,10 +69,12 @@ script:	statements {
 		parser->script->statements = $1;
 	}
 
+eol:	TOKEN_EOL | TOKEN_EOF;
+
 statements: /* empty */ {
 		$$ = create_statements(parser);
 	}
-	| statements statement TOKEN_EOL {
+	| statements statement eol {
 		statement_append($1, $2);
 		$$ = $1;
 	}
@@ -81,7 +82,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);
 	}
 
@@ -109,7 +112,7 @@ statement:
 	}
 	| "if" TOKEN_DELIM conditional
 		elifs
-		"else" TOKEN_EOL
+		"else" sep
 		statements
 		"fi" {
 		$$ = create_statement_if(parser, $3, $4, $7);
@@ -143,18 +146,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)
@@ -224,7 +226,7 @@ struct grub2_statement *create_statement_block(struct grub2_parser *parser,
 	struct grub2_statement_block *stmt =
 		talloc(parser, struct grub2_statement_block);
 	stmt->st.type = STMT_TYPE_BLOCK;
-	stmt->st.exec = NULL;
+	stmt->st.exec = statement_block_execute;
 	stmt->statements = stmts;
 	return &stmt->st;
 }
@@ -307,6 +309,7 @@ void grub2_parser_parse(struct grub2_parser *parser, char *buf, int len)
 	int rc;
 
 	bufstate = yy_scan_bytes(buf, len - 1, parser->scanner);
+	yyset_lineno(1, parser->scanner);
 
 	rc = yyparse(parser);