discover/grub2: improve handling of word & delimiter tokens

[petitboot] / discover / grub2 / grub2.h

diff --git a/discover/grub2/grub2.h b/discover/grub2/grub2.h
index 7f4a8345e666ff7ac78012320610ed07fdfe9c76..0a8932426588b1a8e90b5f575a6ffcc542e94eba 100644 (file)
--- a/discover/grub2/grub2.h
+++ b/discover/grub2/grub2.h
@@ -68,7 +68,7 @@ struct grub2_statement_conditional {
 
 struct grub2_statement_if {
        struct grub2_statement  st;
-       struct grub2_statement  *conditional;
+       struct grub2_statements *conditionals;
        struct grub2_statements *else_case;
 };
 
@@ -83,17 +83,27 @@ 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 grub2_parser {
        void                    *scanner;
        struct grub2_script     *script;
+       bool                    inter_word;
 };
 
 /* type for builtin functions */
@@ -114,6 +124,7 @@ struct grub2_statement *create_statement_conditional(
 
 struct grub2_statement *create_statement_if(struct grub2_parser *parser,
                struct grub2_statement *conditional,
+               struct grub2_statements *elifs,
                struct grub2_statements *else_case);
 
 struct grub2_statement *create_statement_block(struct grub2_parser *parser,
@@ -122,6 +133,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);
 
@@ -142,12 +157,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);
@@ -163,7 +182,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);
 
@@ -172,6 +191,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 */