discover/grub2: Clean up error-handling for grub2 parser & lexer

[petitboot] / discover / grub2 / parser.y

diff --git a/discover/grub2/parser.y b/discover/grub2/parser.y
index 81856dfcaa5a2002fce07a78460a6e1ddb0015d6..8ab17a6ab50c45ca49f8ebc8d566508bf607c38e 100644 (file)
--- a/discover/grub2/parser.y
+++ b/discover/grub2/parser.y
@@ -6,6 +6,7 @@
 
 %{
 #include <talloc/talloc.h>
+#include <log/log.h>
 
 #include "grub2.h"
 #include "parser.h"
@@ -13,7 +14,7 @@
 
 #define YYLEX_PARAM parser->scanner
 
-static void yyerror(struct grub2_parser *, char const *s);
+void yyerror(struct grub2_parser *parser, const char *fmt, ...);
 %}
 
 %union {
@@ -57,6 +58,7 @@ 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
@@ -67,10 +69,12 @@ 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;
        }
@@ -78,7 +82,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);
        }
 
@@ -106,7 +112,7 @@ statement:
        }
        | "if" TOKEN_DELIM conditional
                elifs
-               "else" TOKEN_EOL
+               "else" sep
                statements
                "fi" {
                $$ = create_statement_if(parser, $3, $4, $7);
@@ -140,11 +146,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)
@@ -214,7 +226,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;
 }