%token TOKEN_EOL
%token TOKEN_DELIM
%token <word> TOKEN_WORD
+%token TOKEN_EOF 0
%start script
%debug
parser->script->statements = $1;
}
+eol: TOKEN_EOL | TOKEN_EOF;
+
statements: /* empty */ {
$$ = create_statements(parser);
}
- | statements statement TOKEN_EOL {
+ | statements statement eol {
statement_append($1, $2);
$$ = $1;
}
$$ = $1;
}
-conditional: statement TOKEN_EOL "then" TOKEN_EOL statements {
+sep: TOKEN_DELIM | TOKEN_EOL;
+
+conditional: statement TOKEN_EOL "then" sep statements {
$$ = create_statement_conditional(parser, $1, $5);
}
}
| "if" TOKEN_DELIM conditional
elifs
- "else" TOKEN_EOL
+ "else" sep
statements
"fi" {
$$ = create_statement_if(parser, $3, $4, $7);
struct grub2_statement_block *stmt =
talloc(parser, struct grub2_statement_block);
stmt->st.type = STMT_TYPE_BLOCK;
- stmt->st.exec = NULL;
+ stmt->st.exec = statement_block_execute;
stmt->statements = stmts;
return &stmt->st;
}