struct grub2_statement *create_statement_simple(struct grub2_parser *parser,
struct grub2_argv *argv)
{
- struct grub2_statement *stmt = talloc(parser, struct grub2_statement);
- stmt->type = STMT_TYPE_SIMPLE;
- stmt->simple.argv = argv;
- return stmt;
+ struct grub2_statement_simple *stmt =
+ talloc(parser, struct grub2_statement_simple);
+ stmt->st.type = STMT_TYPE_SIMPLE;
+ stmt->st.exec = statement_simple_execute;
+ stmt->argv = argv;
+ return &stmt->st;
}
struct grub2_statement *create_statement_menuentry(struct grub2_parser *parser,
struct grub2_argv *argv, struct grub2_statements *stmts)
{
- struct grub2_statement *stmt = talloc(parser, struct grub2_statement);
- stmt->type = STMT_TYPE_MENUENTRY;
- stmt->menuentry.argv = argv;
- stmt->menuentry.statements = stmts;
- return stmt;
+ struct grub2_statement_menuentry *stmt =
+ talloc(parser, struct grub2_statement_menuentry);
+ stmt->st.type = STMT_TYPE_MENUENTRY;
+ stmt->st.exec = NULL;
+ stmt->argv = argv;
+ stmt->statements = stmts;
+ return &stmt->st;
}
struct grub2_statement *create_statement_if(struct grub2_parser *parser,
struct grub2_statements *true_case,
struct grub2_statements *false_case)
{
- struct grub2_statement *stmt = talloc(parser, struct grub2_statement);
- stmt->type = STMT_TYPE_IF;
- stmt->ifstmt.condition = condition;
- stmt->ifstmt.true_case = true_case;
- stmt->ifstmt.false_case = false_case;
- return stmt;
+ struct grub2_statement_if *stmt =
+ talloc(parser, struct grub2_statement_if);
+ stmt->st.type = STMT_TYPE_IF;
+ stmt->st.exec = statement_if_execute;
+ stmt->condition = condition;
+ stmt->true_case = true_case;
+ stmt->false_case = false_case;
+ return &stmt->st;
}
+
+struct grub2_statement *create_statement_block(struct grub2_parser *parser,
+ struct grub2_statements *stmts)
+{
+ struct grub2_statement_block *stmt =
+ talloc(parser, struct grub2_statement_block);
+ stmt->st.type = STMT_TYPE_BLOCK;
+ stmt->st.exec = NULL;
+ stmt->statements = stmts;
+ return &stmt->st;
+}
+
void statement_append(struct grub2_statements *stmts,
struct grub2_statement *stmt)
{
list_add_tail(&stmts->list, &stmt->list);
}
-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 *word = talloc(parser, struct grub2_word);
+ word->type = GRUB2_WORD_TEXT;
word->text = talloc_strdup(word, text);
- word->expand = expand;
- word->split = split;
+ word->next = NULL;
+ return word;
+}
+
+struct grub2_word *create_word_var(struct grub2_parser *parser,
+ const char *name, bool split)
+{
+ struct grub2_word *word = talloc(parser, struct grub2_word);
+ word->type = GRUB2_WORD_VAR;
+ word->var.name = talloc_strdup(word, name);
+ word->var.split = split;
word->next = NULL;
return word;
}