%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 {
%token TOKEN_IN "in"
%token TOKEN_MENUENTRY "menuentry"
%token TOKEN_SELECT "select"
+%token TOKEN_SUBMENU "submenu"
%token TOKEN_THEN "then"
%token TOKEN_TIME "time"
%token TOKEN_UTIL "until"
%type <statement> statement
%type <statements> statements
+%type <statement> conditional
+%type <statement> elif
+%type <statements> elifs
%type <argv> words
%type <word> word
%token TOKEN_EOL
%token TOKEN_DELIM
%token <word> TOKEN_WORD
+%token TOKEN_EOF 0
%start script
%debug
+%{
+#include "lexer.h"
+%}
+
%%
-script: statements {
+script: statements {
parser->script->statements = $1;
}
-statements: statement {
+eol: TOKEN_EOL | TOKEN_EOF;
+
+statements: /* empty */ {
$$ = create_statements(parser);
- statement_append($$, $1);
}
- | statements statement {
+ | statements statement eol {
statement_append($1, $2);
$$ = $1;
}
+ | statements TOKEN_EOL {
+ $$ = $1;
+ }
+
+sep: TOKEN_DELIM | TOKEN_EOL;
+
+conditional: statement TOKEN_EOL "then" sep statements {
+ $$ = create_statement_conditional(parser, $1, $5);
+ }
+
+elif: "elif" TOKEN_DELIM conditional {
+ $$ = $3;
+ }
-statement: TOKEN_EOL {
- $$ = NULL;
+elifs: /* empty */ {
+ $$ = create_statements(parser);
+ }
+ | elifs elif {
+ statement_append($1, $2);
+ $$ = $1;
}
- | words TOKEN_EOL {
+
+statement:
+ words {
$$ = create_statement_simple(parser, $1);
}
| '{' statements '}' {
$$ = create_statement_block(parser, $2);
}
- | "if" TOKEN_DELIM statement
- "then" TOKEN_EOL
- statements
- "fi" TOKEN_EOL {
- $$ = create_statement_if(parser, $3, $6, NULL);
+ | "if" TOKEN_DELIM conditional elifs "fi" {
+ $$ = create_statement_if(parser, $3, $4, NULL);
}
- | "if" TOKEN_DELIM statement
- "then" TOKEN_EOL
- statements
- "else" TOKEN_EOL
+ | "if" TOKEN_DELIM conditional
+ elifs
+ "else" sep
statements
- "fi" TOKEN_EOL {
- $$ = create_statement_if(parser, $3, $6, $9);
+ "fi" {
+ $$ = create_statement_if(parser, $3, $4, $7);
}
| "function" TOKEN_DELIM word TOKEN_DELIM '{' statements '}' {
$$ = create_statement_function(parser, $3, $6);
}
| "menuentry" TOKEN_DELIM words TOKEN_DELIM
- '{' statements '}'
- TOKEN_EOL {
+ '{' statements '}' {
$$ = create_statement_menuentry(parser, $3, $6);
}
+ | "submenu" TOKEN_DELIM words TOKEN_DELIM
+ '{' statements '}' {
+ /* we just flatten everything */
+ $$ = create_statement_block(parser, $6);
+ }
+ | "for" TOKEN_DELIM word TOKEN_DELIM "in" TOKEN_DELIM words TOKEN_EOL
+ "do" sep
+ statements
+ "done" {
+ $$ = create_statement_for(parser, $3, $7, $11);
+ }
words: word {
$$ = create_argv(parser);
}
%%
-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)
return &stmt->st;
}
-struct grub2_statement *create_statement_if(struct grub2_parser *parser,
+struct grub2_statement *create_statement_conditional(
+ struct grub2_parser *parser,
struct grub2_statement *condition,
- struct grub2_statements *true_case,
- struct grub2_statements *false_case)
+ struct grub2_statements *statements)
+{
+ struct grub2_statement_conditional *stmt =
+ talloc(parser, struct grub2_statement_conditional);
+ stmt->st.type = STMT_TYPE_CONDITIONAL;
+ stmt->condition = condition;
+ stmt->statements = statements;
+ return &stmt->st;
+}
+
+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->condition = condition;
- stmt->true_case = true_case;
- stmt->false_case = false_case;
+ stmt->conditionals = elifs;
+ stmt->else_case = else_case;
return &stmt->st;
}
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;
}
return &stmt->st;
}
+struct grub2_statement *create_statement_for(struct grub2_parser *parser,
+ struct grub2_word *var, struct grub2_argv *list,
+ struct grub2_statements *body)
+{
+ struct grub2_statement_for *stmt =
+ talloc(parser, struct grub2_statement_for);
+ stmt->st.exec = statement_for_execute;
+ stmt->var = var;
+ stmt->list = list;
+ stmt->body = body;
+ return &stmt->st;
+}
+
void statement_append(struct grub2_statements *stmts,
struct grub2_statement *stmt)
{
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;
+ if (!len)
+ return;
+
+ 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);