X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fgrub2%2Fgrub2.h;h=68176fbe3e18cca5f4ed010204812b7312f7b423;hp=4d083ae9ed18f8f8bb6cfc2d5d9582ed54a5c78e;hb=60252961c21a0f102e69373f2bea36f8af495c29;hpb=a33e7992485e95a60add27af37327dc9f0eb3a34

diff --git a/discover/grub2/grub2.h b/discover/grub2/grub2.h
index 4d083ae..68176fb 100644
--- a/discover/grub2/grub2.h
+++ b/discover/grub2/grub2.h
@@ -83,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 */
@@ -123,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);
 
@@ -151,6 +166,8 @@ 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);
@@ -166,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);
 
@@ -175,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 */