discover/grub2: Fixes for bison 3.x

[petitboot] / discover / grub2 / parser.y

diff --git a/discover/grub2/parser.y b/discover/grub2/parser.y
index 52dac9c7b27ee28d804010f3233279988205acd9..0beddd6fc3e28252af96acb74cd12a34a0186ebd 100644 (file)
--- a/discover/grub2/parser.y
+++ b/discover/grub2/parser.y
@@ -2,18 +2,16 @@
 %pure-parser
 %lex-param { yyscan_t scanner }
 %parse-param { struct grub2_parser *parser }
+%parse-param { void *scanner }
 %error-verbose
 
 %{
 #include <talloc/talloc.h>
+#include <log/log.h>
 
 #include "grub2.h"
-#include "parser.h"
-#include "lexer.h"
-
-#define YYLEX_PARAM parser->scanner
 
-static void yyerror(struct grub2_parser *, char const *s);
+void yyerror(struct grub2_parser *parser, const char *fmt, ...);
 %}
 
 %union {
@@ -48,6 +46,8 @@ static void yyerror(struct grub2_parser *, char const *s);
 %type <statement>      statement
 %type <statements>     statements
 %type <statement>      conditional
+%type <statement>      elif
+%type <statements>     elifs
 %type <argv>           words
 %type <word>           word
 
@@ -55,20 +55,27 @@ static void yyerror(struct grub2_parser *, char const *s);
 %token TOKEN_EOL
 %token TOKEN_DELIM
 %token <word> TOKEN_WORD
+%token TOKEN_EOF 0
 
 %start script
 %debug
 
+%{
+#include "lexer.h"
+%}
+
 %%
 
 script:        statements {
                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;
        }
@@ -76,10 +83,24 @@ 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);
        }
 
+elif: "elif" TOKEN_DELIM conditional {
+               $$ = $3;
+      }
+
+elifs: /* empty */ {
+               $$ = create_statements(parser);
+       }
+       | elifs elif {
+               statement_append($1, $2);
+               $$ = $1;
+       }
+
 statement:
        words {
                   $$ = create_statement_simple(parser, $1);
@@ -87,14 +108,15 @@ statement:
        | '{' statements '}' {
                $$ = create_statement_block(parser, $2);
        }
-       | "if" TOKEN_DELIM conditional "fi" {
-               $$ = create_statement_if(parser, $3, NULL);
+       | "if" TOKEN_DELIM conditional elifs "fi" {
+               $$ = create_statement_if(parser, $3, $4, NULL);
        }
        | "if" TOKEN_DELIM conditional
-               "else" TOKEN_EOL
+               elifs
+               "else" sep
                statements
                "fi" {
-               $$ = create_statement_if(parser, $3, $6);
+               $$ = create_statement_if(parser, $3, $4, $7);
        }
        | "function" TOKEN_DELIM word TOKEN_DELIM '{' statements '}' {
                $$ = create_statement_function(parser, $3, $6);
@@ -125,11 +147,17 @@ word:     TOKEN_WORD
        }
 
 %%
-void yyerror(struct grub2_parser *parser, char const *s)
+void yyerror(struct grub2_parser *parser, const char *fmt, ...)
 {
-       fprintf(stderr, "%d: error: %s '%s'\n",
-                       yyget_lineno(parser->scanner),
-                       s, yyget_text(parser->scanner));
+       const char *str;
+       va_list ap;
+
+       va_start(ap, fmt);
+       str = talloc_vasprintf(parser, fmt, ap);
+       va_end(ap);
+
+       pb_log("parse error: %d('%s'): %s\n", yyget_lineno(parser->scanner),
+                                       yyget_text(parser->scanner), str);
 }
 
 struct grub2_statements *create_statements(struct grub2_parser *parser)
@@ -178,13 +206,17 @@ 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_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->conditional = conditional;
+       stmt->conditionals = elifs;
        stmt->else_case = else_case;
        return &stmt->st;
 }
@@ -195,7 +227,7 @@ struct grub2_statement *create_statement_block(struct grub2_parser *parser,
        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;
 }
@@ -272,14 +304,18 @@ struct grub2_parser *grub2_parser_create(struct discover_context *ctx)
        return parser;
 }
 
-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)
 {
        YY_BUFFER_STATE bufstate;
        int rc;
 
+       parser->script->filename = filename;
+
        bufstate = yy_scan_bytes(buf, len - 1, parser->scanner);
+       yyset_lineno(1, parser->scanner);
 
-       rc = yyparse(parser);
+       rc = yyparse(parser, parser->scanner);
 
        yy_delete_buffer(bufstate, parser->scanner);