X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fgrub2%2Fparser.y;h=02ca7b2799f53f57bc9ef55f6dcfacbdae880a67;hp=6d3ff2117140dd9d4b3b8a1de7643fa1cd3429ac;hb=07fe1662d2a49f4e9e3c5b0451d141f69328262d;hpb=6e14e1404f36f7706016531e4e19e5e6025a846a diff --git a/discover/grub2/parser.y b/discover/grub2/parser.y index 6d3ff21..02ca7b2 100644 --- a/discover/grub2/parser.y +++ b/discover/grub2/parser.y @@ -84,7 +84,9 @@ statements: /* empty */ { $$ = $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); } @@ -112,7 +114,7 @@ statement: } | "if" TOKEN_DELIM conditional elifs - "else" TOKEN_EOL + "else" sep statements "fi" { $$ = create_statement_if(parser, $3, $4, $7);