X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fgrub2%2Fgrub2.h;h=68176fbe3e18cca5f4ed010204812b7312f7b423;hp=5b83fad5d05f38503fd755207de96b8955d800cd;hb=fbe876dd19e4c289ba940b2e7f0ae0b23b790025;hpb=e8a50ad2461a8efaa4d71ea19692a1b63a0f9bc2

diff --git a/discover/grub2/grub2.h b/discover/grub2/grub2.h
index 5b83fad..68176fb 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 {
@@ -77,17 +83,28 @@ struct grub2_statement_function {
 	struct grub2_statements	*body;
 };
 
+struct grub2_statement_for {
+	struct grub2_statement	st;
+	struct grub2_word	*var;
+	struct grub2_argv	*list;
+	struct grub2_statements	*body;
+};
+
 struct grub2_script {
 	struct grub2_statements		*statements;
 	struct list			environment;
 	struct list			symtab;
 	struct discover_context		*ctx;
 	struct discover_boot_option	*opt;
+	const char			*filename;
+	unsigned int			n_options;
+	struct list			options;
 };
 
 struct grub2_parser {
 	void			*scanner;
 	struct grub2_script	*script;
+	bool			inter_word;
 };
 
 /* type for builtin functions */
@@ -102,10 +119,14 @@ 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);
@@ -113,6 +134,10 @@ struct grub2_statement *create_statement_block(struct grub2_parser *parser,
 struct grub2_statement *create_statement_function(struct grub2_parser *parser,
 		struct grub2_word *name, struct grub2_statements *body);
 
+struct grub2_statement *create_statement_for(struct grub2_parser *parser,
+		struct grub2_word *var, struct grub2_argv *list,
+		struct grub2_statements *body);
+
 struct grub2_word *create_word_text(struct grub2_parser *parser,
 		const char *text);
 
@@ -133,12 +158,16 @@ 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);
+int statement_for_execute(struct grub2_script *script,
+		struct grub2_statement *statement);
 
 struct grub2_script *create_script(struct grub2_parser *parser,
 		struct discover_context *ctx);
@@ -154,7 +183,7 @@ void script_register_function(struct grub2_script *script,
 void register_builtins(struct grub2_script *script);
 
 /* resources */
-struct resource *create_grub2_resource(void *ctx,
+struct resource *create_grub2_resource(struct discover_boot_option *opt,
 		struct discover_device *orig_device,
 		const char *root, const char *path);
 
@@ -163,6 +192,7 @@ bool resolve_grub2_resource(struct device_handler *handler,
 
 /* external parser api */
 struct grub2_parser *grub2_parser_create(struct discover_context *ctx);
-void grub2_parser_parse(struct grub2_parser *parser, char *buf, int len);
+void grub2_parser_parse(struct grub2_parser *parser, const char *filename,
+		char *buf, int len);
 #endif /* GRUB2_H */