%{
#include <talloc/talloc.h>
+#include <log/log.h>
#include "grub2.h"
#include "parser.h"
#include "lexer.h"
-static void print_token(FILE *fp, int type, YYSTYPE value);
-
#define YYLEX_PARAM parser->scanner
-#define YYPRINT(f, t, v) print_token(f, t, v)
-static void yyerror(struct grub2_parser *, char const *s);
+void yyerror(struct grub2_parser *parser, const char *fmt, ...);
%}
%union {
%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);
}
%%
-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;
-static void print_token(FILE *fp, int type, YYSTYPE value)
-{
- if (type != TOKEN_WORD)
- return;
- fprintf(fp, "%s", value.word->text);
+ 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)
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;
}
int rc;
bufstate = yy_scan_bytes(buf, len - 1, parser->scanner);
+ yyset_lineno(1, parser->scanner);
rc = yyparse(parser);