discover/grub2: Allow EOF as a statement terminator

[petitboot] / discover / grub2 / parser.y

diff --git a/discover/grub2/parser.y b/discover/grub2/parser.y
index 81856dfcaa5a2002fce07a78460a6e1ddb0015d6..292ce0725b6af6bdffecc8ddad80c9e11f660460 100644 (file)
--- 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,