X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fgrub2%2Fparser.y;h=859eba30479b93eeac8fa4a8c00d21d7916931d4;hp=550c3748df70c0ec1a3636a3f2fc0e242e19e9ef;hb=a77e8d42cd7b983d9fa5746f07e66a6fe04b6a0d;hpb=d808f5d2ec8e232d736a5f811d647df91e2a5b43

diff --git a/discover/grub2/parser.y b/discover/grub2/parser.y
index 550c374..859eba3 100644
--- a/discover/grub2/parser.y
+++ b/discover/grub2/parser.y
@@ -39,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"
@@ -95,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);
@@ -181,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)
 {