X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fgrub2%2Fgrub2.h;h=4d083ae9ed18f8f8bb6cfc2d5d9582ed54a5c78e;hp=2de77a280b96ce97f2bbcefaa680ade0fc676221;hb=9cf9430d5a1db0addd4788798fd7275d2c514f3c;hpb=64899475f9b895628fd7b654f7b549e50494229a

diff --git a/discover/grub2/grub2.h b/discover/grub2/grub2.h
index 2de77a2..4d083ae 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_statements	*conditionals;
+	struct grub2_statements	*else_case;
 };
 
 struct grub2_statement_block {
@@ -71,6 +77,11 @@ struct grub2_statement_block {
 	struct grub2_statements	*statements;
 };
 
+struct grub2_statement_function {
+	struct grub2_statement	st;
+	struct grub2_word	*name;
+	struct grub2_statements	*body;
+};
 
 struct grub2_script {
 	struct grub2_statements		*statements;
@@ -85,10 +96,6 @@ struct grub2_parser {
 	struct grub2_script	*script;
 };
 
-struct grub2_root {
-	char *uuid;
-};
-
 /* type for builtin functions */
 typedef int (*grub2_function)(struct grub2_script *script, void *data,
 				int argc, char *argv[]);
@@ -101,14 +108,21 @@ 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 *elifs,
+		struct grub2_statements *else_case);
 
 struct grub2_statement *create_statement_block(struct grub2_parser *parser,
 		struct grub2_statements *stmts);
 
+struct grub2_statement *create_statement_function(struct grub2_parser *parser,
+		struct grub2_word *name, struct grub2_statements *body);
+
 struct grub2_word *create_word_text(struct grub2_parser *parser,
 		const char *text);
 
@@ -129,10 +143,14 @@ void script_execute(struct grub2_script *script);
 
 int statement_simple_execute(struct grub2_script *script,
 		struct grub2_statement *statement);
+int statement_block_execute(struct grub2_script *script,
+		struct grub2_statement *statement);
 int statement_if_execute(struct grub2_script *script,
 		struct grub2_statement *statement);
 int statement_menuentry_execute(struct grub2_script *script,
 		struct grub2_statement *statement);
+int statement_function_execute(struct grub2_script *script,
+		struct grub2_statement *statement);
 
 struct grub2_script *create_script(struct grub2_parser *parser,
 		struct discover_context *ctx);
@@ -150,7 +168,7 @@ void register_builtins(struct grub2_script *script);
 /* resources */
 struct resource *create_grub2_resource(void *ctx,
 		struct discover_device *orig_device,
-		struct grub2_root *root, const char *path);
+		const char *root, const char *path);
 
 bool resolve_grub2_resource(struct device_handler *handler,
 		struct resource *res);