X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fgrub2%2Fparser.y;h=6d3ff2117140dd9d4b3b8a1de7643fa1cd3429ac;hb=27037bcd151ff8ecad1aaca7eaa06fb5c3f9fd1f;hp=81856dfcaa5a2002fce07a78460a6e1ddb0015d6;hpb=d39ae394911f945cd4a7789a8b210a5662852c46;p=petitboot

diff --git a/discover/grub2/parser.y b/discover/grub2/parser.y
index 81856df..6d3ff21 100644
--- a/discover/grub2/parser.y
+++ b/discover/grub2/parser.y
@@ -11,7 +11,10 @@
 #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);
 %}
@@ -57,6 +60,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
@@ -67,10 +71,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;
 	}
@@ -147,6 +153,13 @@ void yyerror(struct grub2_parser *parser, char const *s)
 			s, yyget_text(parser->scanner));
 }
 
+static void print_token(FILE *fp, int type, YYSTYPE value)
+{
+	if (type != TOKEN_WORD)
+		return;
+	fprintf(fp, "%s", value.word->text);
+}
+
 struct grub2_statements *create_statements(struct grub2_parser *parser)
 {
 	struct grub2_statements *stmts = talloc(parser,
@@ -214,7 +227,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;
 }