discover/grub2: Allow both delimiters and EOLs after a "then" reserved word

[petitboot] / discover / grub2 / parser.y

diff --git a/discover/grub2/parser.y b/discover/grub2/parser.y
index 81856dfcaa5a2002fce07a78460a6e1ddb0015d6..02ca7b2799f53f57bc9ef55f6dcfacbdae880a67 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;
        }
@@ -78,7 +84,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);
        }
 
@@ -106,7 +114,7 @@ statement:
        }
        | "if" TOKEN_DELIM conditional
                elifs
-               "else" TOKEN_EOL
+               "else" sep
                statements
                "fi" {
                $$ = create_statement_if(parser, $3, $4, $7);
@@ -147,6 +155,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 +229,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;
 }