discover/grub2: Implement submenu

[petitboot] / discover / grub2 / parser.y

diff --git a/discover/grub2/parser.y b/discover/grub2/parser.y
index e13cd72a8f72e6358e7dfa7ab7387000b384efc4..859eba30479b93eeac8fa4a8c00d21d7916931d4 100644 (file)
--- a/discover/grub2/parser.y
+++ b/discover/grub2/parser.y
@@ -2,6 +2,7 @@
 %pure-parser
 %lex-param { yyscan_t scanner }
 %parse-param { struct grub2_parser *parser }
+%error-verbose
 
 %{
 #include <talloc/talloc.h>
@@ -38,6 +39,7 @@ static void yyerror(struct grub2_parser *, char const *s);
 %token TOKEN_IN                "in"
 %token TOKEN_MENUENTRY         "menuentry"
 %token TOKEN_SELECT            "select"
+%token TOKEN_SUBMENU           "submenu"
 %token TOKEN_THEN              "then"
 %token TOKEN_TIME              "time"
 %token TOKEN_UTIL              "until"
@@ -94,11 +96,20 @@ statement: TOKEN_EOL {
                "fi" TOKEN_EOL {
                $$ = create_statement_if(parser, $3, $6, $9);
        }
+       | "function" TOKEN_DELIM word TOKEN_DELIM '{' statements '}' {
+               $$ = create_statement_function(parser, $3, $6);
+       }
        | "menuentry" TOKEN_DELIM words TOKEN_DELIM
                '{' statements '}'
                TOKEN_EOL {
                $$ = create_statement_menuentry(parser, $3, $6);
        }
+       | "submenu" TOKEN_DELIM words TOKEN_DELIM
+               '{' statements '}'
+               TOKEN_EOL {
+               /* we just flatten everything */
+               $$ = create_statement_block(parser, $6);
+       }
 
 words: word {
                $$ = create_argv(parser);
@@ -180,6 +191,17 @@ struct grub2_statement *create_statement_block(struct grub2_parser *parser,
        return &stmt->st;
 }
 
+struct grub2_statement *create_statement_function(struct grub2_parser *parser,
+               struct grub2_word *name, struct grub2_statements *body)
+{
+       struct grub2_statement_function *stmt =
+               talloc(parser, struct grub2_statement_function);
+       stmt->st.exec = statement_function_execute;
+       stmt->name = name;
+       stmt->body = body;
+       return &stmt->st;
+}
+
 void statement_append(struct grub2_statements *stmts,
                struct grub2_statement *stmt)
 {
@@ -244,13 +266,15 @@ struct grub2_parser *grub2_parser_create(struct discover_context *ctx)
 void grub2_parser_parse(struct grub2_parser *parser, char *buf, int len)
 {
        YY_BUFFER_STATE bufstate;
+       int rc;
 
        bufstate = yy_scan_bytes(buf, len - 1, parser->scanner);
 
-       yyparse(parser);
+       rc = yyparse(parser);
 
        yy_delete_buffer(bufstate, parser->scanner);
 
-       script_execute(parser->script);
+       if (!rc)
+               script_execute(parser->script);
 }