X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fgrub2%2Fgrub2.h;h=0643a7293d8aba9025e742d5c822f7ff8901d6fc;hb=c0b2be44ee953f9f50737b959e0def6e2df24629;hp=2c7951a5520c90e4c5b5040f6da81fedc634cb6e;hpb=1284a547ec73795d7d76dc099426fb89c3359f25;p=petitboot

diff --git a/discover/grub2/grub2.h b/discover/grub2/grub2.h
index 2c7951a..0643a72 100644
--- a/discover/grub2/grub2.h
+++ b/discover/grub2/grub2.h
@@ -18,37 +18,41 @@ struct grub2_argv {
 	struct list		words;
 };
 
+struct grub2_statements {
+	struct list		list;
+};
+
+struct grub2_statement {
+	struct list_item	list;
+	enum {
+		STMT_TYPE_SIMPLE,
+		STMT_TYPE_MENUENTRY,
+		STMT_TYPE_IF,
+		STMT_TYPE_BLOCK,
+	} type;
+};
+
 struct grub2_statement_simple {
+	struct grub2_statement	st;
 	struct grub2_argv	*argv;
 };
 
 struct grub2_statement_menuentry {
+	struct grub2_statement	st;
 	struct grub2_argv	*argv;
 	struct grub2_statements	*statements;
 };
 
 struct grub2_statement_if {
+	struct grub2_statement	st;
 	struct grub2_statement	*condition;
 	struct grub2_statements	*true_case;
 	struct grub2_statements	*false_case;
 };
 
-struct grub2_statement {
-	struct list_item	list;
-	enum {
-		STMT_TYPE_SIMPLE,
-		STMT_TYPE_MENUENTRY,
-		STMT_TYPE_IF,
-	} type;
-	union {
-		struct grub2_statement_simple		simple;
-		struct grub2_statement_menuentry	menuentry;
-		struct grub2_statement_if		ifstmt;
-	};
-};
-
-struct grub2_statements {
-	struct list		list;
+struct grub2_statement_block {
+	struct grub2_statement	st;
+	struct grub2_statements	*statements;
 };
 
 struct grub2_parser {
@@ -69,6 +73,9 @@ struct grub2_statement *create_statement_if(struct grub2_parser *parser,
 		struct grub2_statements *true_case,
 		struct grub2_statements *false_case);
 
+struct grub2_statement *create_statement_block(struct grub2_parser *parser,
+		struct grub2_statements *stmts);
+
 struct grub2_word *create_word(struct grub2_parser *parser, const char *text,
 		bool expand, bool split);