X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fgrub2%2Fparser-api.c;h=9ccf15eb94ffefdf7fe53ae96f3def672edaab2d;hp=6e05ecf56faaa9261ee5c292aa35e97bbf7155e0;hb=352621fe8719c8488098719240252bc04c303963;hpb=1284a547ec73795d7d76dc099426fb89c3359f25

diff --git a/discover/grub2/parser-api.c b/discover/grub2/parser-api.c
index 6e05ecf..9ccf15e 100644
--- a/discover/grub2/parser-api.c
+++ b/discover/grub2/parser-api.c
@@ -14,20 +14,24 @@ struct grub2_statements *create_statements(struct grub2_parser *parser)
 struct grub2_statement *create_statement_simple(struct grub2_parser *parser,
 		struct grub2_argv *argv)
 {
-	struct grub2_statement *stmt = talloc(parser, struct grub2_statement);
-	stmt->type = STMT_TYPE_SIMPLE;
-	stmt->simple.argv = argv;
-	return stmt;
+	struct grub2_statement_simple *stmt =
+		talloc(parser, struct grub2_statement_simple);
+	stmt->st.type = STMT_TYPE_SIMPLE;
+	stmt->st.exec = statement_simple_execute;
+	stmt->argv = argv;
+	return &stmt->st;
 }
 
 struct grub2_statement *create_statement_menuentry(struct grub2_parser *parser,
 		struct grub2_argv *argv, struct grub2_statements *stmts)
 {
-	struct grub2_statement *stmt = talloc(parser, struct grub2_statement);
-	stmt->type = STMT_TYPE_MENUENTRY;
-	stmt->menuentry.argv = argv;
-	stmt->menuentry.statements = stmts;
-	return stmt;
+	struct grub2_statement_menuentry *stmt =
+		talloc(parser, struct grub2_statement_menuentry);
+	stmt->st.type = STMT_TYPE_MENUENTRY;
+	stmt->st.exec = NULL;
+	stmt->argv = argv;
+	stmt->statements = stmts;
+	return &stmt->st;
 }
 
 struct grub2_statement *create_statement_if(struct grub2_parser *parser,
@@ -35,13 +39,27 @@ struct grub2_statement *create_statement_if(struct grub2_parser *parser,
 		struct grub2_statements *true_case,
 		struct grub2_statements *false_case)
 {
-	struct grub2_statement *stmt = talloc(parser, struct grub2_statement);
-	stmt->type = STMT_TYPE_IF;
-	stmt->ifstmt.condition = condition;
-	stmt->ifstmt.true_case = true_case;
-	stmt->ifstmt.false_case = false_case;
-	return stmt;
+	struct grub2_statement_if *stmt =
+		talloc(parser, struct grub2_statement_if);
+	stmt->st.type = STMT_TYPE_IF;
+	stmt->st.exec = statement_if_execute;
+	stmt->condition = condition;
+	stmt->true_case = true_case;
+	stmt->false_case = false_case;
+	return &stmt->st;
 }
+
+struct grub2_statement *create_statement_block(struct grub2_parser *parser,
+		struct grub2_statements *stmts)
+{
+	struct grub2_statement_block *stmt =
+		talloc(parser, struct grub2_statement_block);
+	stmt->st.type = STMT_TYPE_BLOCK;
+	stmt->st.exec = NULL;
+	stmt->statements = stmts;
+	return &stmt->st;
+}
+
 void statement_append(struct grub2_statements *stmts,
 		struct grub2_statement *stmt)
 {