X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fgrub2%2Fgrub2.h;h=cbd69dc70188b27cd5ae8c77fc4ce404b3c0de3d;hp=33180d49125438519c51b5a905081abe1089ddf7;hb=fb5a2b71f85614114663c86dbba62c5c491a11b9;hpb=1247b4bbbbf102c0cc54f6b3a927e249a9368ba4

diff --git a/discover/grub2/grub2.h b/discover/grub2/grub2.h
index 33180d4..cbd69dc 100644
--- a/discover/grub2/grub2.h
+++ b/discover/grub2/grub2.h
@@ -1,16 +1,23 @@
 #ifndef GRUB2_H
 #define GRUB2_H
 
-#include <regex.h>
 #include <stdbool.h>
 #include <list/list.h>
 
-struct grub2_parser;
+struct grub2_script;
 
 struct grub2_word {
-	const char		*text;
-	bool			expand;
-	bool			split;
+	enum {
+		GRUB2_WORD_TEXT,
+		GRUB2_WORD_VAR,
+	} type;
+	union {
+		char	*text;
+		struct {
+			const char	*name;
+			bool		split;
+		} var;
+	};
 	struct grub2_word	*next;
 	struct list_item	argv_list;
 };
@@ -31,6 +38,8 @@ struct grub2_statement {
 		STMT_TYPE_IF,
 		STMT_TYPE_BLOCK,
 	} type;
+	int			(*exec)(struct grub2_script *,
+					struct grub2_statement *);
 };
 
 struct grub2_statement_simple {
@@ -59,7 +68,6 @@ struct grub2_statement_block {
 struct grub2_script {
 	struct grub2_statements	*statements;
 	struct list		environment;
-	regex_t			var_re;
 };
 
 struct grub2_parser {
@@ -83,8 +91,11 @@ struct grub2_statement *create_statement_if(struct grub2_parser *parser,
 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);
+struct grub2_word *create_word_text(struct grub2_parser *parser,
+		const char *text);
+
+struct grub2_word *create_word_var(struct grub2_parser *parser,
+		const char *name, bool split);
 
 struct grub2_argv *create_argv(struct grub2_parser *parser);
 
@@ -96,6 +107,12 @@ void argv_append(struct grub2_argv *argv, struct grub2_word *word);
 void word_append(struct grub2_word *w1, struct grub2_word *w2);
 
 /* script interface */
+void script_execute(struct grub2_script *script);
+
+int statement_simple_execute(struct grub2_script *script,
+		struct grub2_statement *statement);
+int statement_if_execute(struct grub2_script *script,
+		struct grub2_statement *statement);
 
 struct grub2_script *create_script(void *ctx);