%token TOKEN_IN "in"
%token TOKEN_MENUENTRY "menuentry"
%token TOKEN_SELECT "select"
+%token TOKEN_SUBMENU "submenu"
%token TOKEN_THEN "then"
%token TOKEN_TIME "time"
%token TOKEN_UTIL "until"
%type <statement> statement
%type <statements> statements
+%type <statement> conditional
+%type <statement> elif
+%type <statements> elifs
%type <argv> words
%type <word> word
%%
-script: statements {
+script: statements {
parser->script->statements = $1;
}
-statements: statement {
+statements: /* empty */ {
$$ = create_statements(parser);
- statement_append($$, $1);
}
- | statements statement {
+ | statements statement TOKEN_EOL {
statement_append($1, $2);
$$ = $1;
}
+ | statements TOKEN_EOL {
+ $$ = $1;
+ }
+
+conditional: statement TOKEN_EOL "then" TOKEN_EOL statements {
+ $$ = create_statement_conditional(parser, $1, $5);
+ }
-statement: TOKEN_EOL {
- $$ = NULL;
+elif: "elif" TOKEN_DELIM conditional {
+ $$ = $3;
+ }
+
+elifs: /* empty */ {
+ $$ = create_statements(parser);
+ }
+ | elifs elif {
+ statement_append($1, $2);
+ $$ = $1;
}
- | words TOKEN_EOL {
+
+statement:
+ words {
$$ = create_statement_simple(parser, $1);
}
| '{' statements '}' {
$$ = create_statement_block(parser, $2);
}
- | "if" TOKEN_DELIM statement
- "then" TOKEN_EOL
- statements
- "fi" TOKEN_EOL {
- $$ = create_statement_if(parser, $3, $6, NULL);
+ | "if" TOKEN_DELIM conditional elifs "fi" {
+ $$ = create_statement_if(parser, $3, $4, NULL);
}
- | "if" TOKEN_DELIM statement
- "then" TOKEN_EOL
- statements
+ | "if" TOKEN_DELIM conditional
+ elifs
"else" TOKEN_EOL
statements
- "fi" TOKEN_EOL {
- $$ = create_statement_if(parser, $3, $6, $9);
+ "fi" {
+ $$ = create_statement_if(parser, $3, $4, $7);
+ }
+ | "function" TOKEN_DELIM word TOKEN_DELIM '{' statements '}' {
+ $$ = create_statement_function(parser, $3, $6);
}
| "menuentry" TOKEN_DELIM words TOKEN_DELIM
- '{' statements '}'
- TOKEN_EOL {
+ '{' statements '}' {
$$ = create_statement_menuentry(parser, $3, $6);
}
+ | "submenu" TOKEN_DELIM words TOKEN_DELIM
+ '{' statements '}' {
+ /* we just flatten everything */
+ $$ = create_statement_block(parser, $6);
+ }
words: word {
$$ = create_argv(parser);
return &stmt->st;
}
-struct grub2_statement *create_statement_if(struct grub2_parser *parser,
+struct grub2_statement *create_statement_conditional(
+ struct grub2_parser *parser,
struct grub2_statement *condition,
- struct grub2_statements *true_case,
- struct grub2_statements *false_case)
+ struct grub2_statements *statements)
+{
+ struct grub2_statement_conditional *stmt =
+ talloc(parser, struct grub2_statement_conditional);
+ stmt->st.type = STMT_TYPE_CONDITIONAL;
+ stmt->condition = condition;
+ stmt->statements = statements;
+ return &stmt->st;
+}
+
+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_if *stmt =
talloc(parser, struct grub2_statement_if);
+
+ list_add(&elifs->list, &conditional->list);
+
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;
+ stmt->conditionals = elifs;
+ stmt->else_case = else_case;
return &stmt->st;
}
return &stmt->st;
}
+struct grub2_statement *create_statement_function(struct grub2_parser *parser,
+ struct grub2_word *name, struct grub2_statements *body)
+{
+ struct grub2_statement_function *stmt =
+ talloc(parser, struct grub2_statement_function);
+ stmt->st.exec = statement_function_execute;
+ stmt->name = name;
+ stmt->body = body;
+ return &stmt->st;
+}
+
void statement_append(struct grub2_statements *stmts,
struct grub2_statement *stmt)
{