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 52dac9c7b27ee28d804010f3233279988205acd9..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);
 %}
@@ -48,6 +51,8 @@ static void yyerror(struct grub2_parser *, char const *s);
 %type <statement>      statement
 %type <statements>     statements
 %type <statement>      conditional
+%type <statement>      elif
+%type <statements>     elifs
 %type <argv>           words
 %type <word>           word
 
@@ -55,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
@@ -65,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;
        }
@@ -80,6 +88,18 @@ conditional: statement TOKEN_EOL "then" TOKEN_EOL statements {
                $$ = create_statement_conditional(parser, $1, $5);
        }
 
+elif: "elif" TOKEN_DELIM conditional {
+               $$ = $3;
+      }
+
+elifs: /* empty */ {
+               $$ = create_statements(parser);
+       }
+       | elifs elif {
+               statement_append($1, $2);
+               $$ = $1;
+       }
+
 statement:
        words {
                   $$ = create_statement_simple(parser, $1);
@@ -87,14 +107,15 @@ statement:
        | '{' statements '}' {
                $$ = create_statement_block(parser, $2);
        }
-       | "if" TOKEN_DELIM conditional "fi" {
-               $$ = create_statement_if(parser, $3, NULL);
+       | "if" TOKEN_DELIM conditional elifs "fi" {
+               $$ = create_statement_if(parser, $3, $4, NULL);
        }
        | "if" TOKEN_DELIM conditional
+               elifs
                "else" TOKEN_EOL
                statements
                "fi" {
-               $$ = create_statement_if(parser, $3, $6);
+               $$ = create_statement_if(parser, $3, $4, $7);
        }
        | "function" TOKEN_DELIM word TOKEN_DELIM '{' statements '}' {
                $$ = create_statement_function(parser, $3, $6);
@@ -132,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,
@@ -178,13 +206,17 @@ struct grub2_statement *create_statement_conditional(
 
 struct grub2_statement *create_statement_if(struct grub2_parser *parser,
                struct grub2_statement *conditional,
+               struct grub2_statements *elifs,
                struct grub2_statements *else_case)
 {
        struct grub2_statement_if *stmt =
                talloc(parser, struct grub2_statement_if);
+
+       list_add(&elifs->list, &conditional->list);
+
        stmt->st.type = STMT_TYPE_IF;
        stmt->st.exec = statement_if_execute;
-       stmt->conditional = conditional;
+       stmt->conditionals = elifs;
        stmt->else_case = else_case;
        return &stmt->st;
 }