discover/grub2: Create 'conditional' statements

Rather than holding the condition and conditional-statements in struct
grub2_statment_if, create a new conditional type that contains these. We
can then use this to implement elif statements.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

1 files changed, 15 insertions, 6 deletions

diff --git a/discover/grub2/grub2.h b/discover/grub2/grub2.h
index 5b83fad..7f4a834 100644
--- a/discover/grub2/grub2.h
+++ b/discover/grub2/grub2.h
@@ -43,6 +43,7 @@ struct grub2_statement {
 		STMT_TYPE_MENUENTRY,
 		STMT_TYPE_IF,
 		STMT_TYPE_BLOCK,
+		STMT_TYPE_CONDITIONAL,
 	} type;
 	int			(*exec)(struct grub2_script *,
 					struct grub2_statement *);
@@ -59,11 +60,16 @@ struct grub2_statement_menuentry {
 	struct grub2_statements	*statements;
 };
 
-struct grub2_statement_if {
+struct grub2_statement_conditional {
 	struct grub2_statement	st;
 	struct grub2_statement	*condition;
-	struct grub2_statements	*true_case;
-	struct grub2_statements	*false_case;
+	struct grub2_statements	*statements;
+};
+
+struct grub2_statement_if {
+	struct grub2_statement	st;
+	struct grub2_statement	*conditional;
+	struct grub2_statements	*else_case;
 };
 
 struct grub2_statement_block {
@@ -102,10 +108,13 @@ struct grub2_statement *create_statement_simple(struct grub2_parser *parser,
 struct grub2_statement *create_statement_menuentry(struct grub2_parser *parser,
 		struct grub2_argv *argv, struct grub2_statements *stmts);
 
+struct grub2_statement *create_statement_conditional(
+		struct grub2_parser *parser, struct grub2_statement *condition,
+		struct grub2_statements *statements);
+
 struct grub2_statement *create_statement_if(struct grub2_parser *parser,
-		struct grub2_statement *condition,
-		struct grub2_statements *true_case,
-		struct grub2_statements *false_case);
+		struct grub2_statement *conditional,
+		struct grub2_statements *else_case);
 
 struct grub2_statement *create_statement_block(struct grub2_parser *parser,
 		struct grub2_statements *stmts);