X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fgrub2%2Fparser.y;h=02ca7b2799f53f57bc9ef55f6dcfacbdae880a67;hp=f49cecdc3382cb630817b00d071d4ff00dfeaa59;hb=9cf9430d5a1db0addd4788798fd7275d2c514f3c;hpb=2ea5eb23b027519372dd20fbe8f958c06ac2aa6c;ds=sidebyside diff --git a/discover/grub2/parser.y b/discover/grub2/parser.y index f49cecd..02ca7b2 100644 --- a/discover/grub2/parser.y +++ b/discover/grub2/parser.y @@ -2,6 +2,7 @@ %pure-parser %lex-param { yyscan_t scanner } %parse-param { struct grub2_parser *parser } +%error-verbose %{ #include @@ -10,7 +11,10 @@ #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); %} @@ -29,6 +33,7 @@ static void yyerror(struct grub2_parser *, char const *s); %token TOKEN_DO "do" %token TOKEN_DONE "done" %token TOKEN_ELIF "elif" +%token TOKEN_ELSE "else" %token TOKEN_ESAC "esac" %token TOKEN_FI "fi" %token TOKEN_FOR "for" @@ -37,6 +42,7 @@ static void yyerror(struct grub2_parser *, char const *s); %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" @@ -44,6 +50,9 @@ static void yyerror(struct grub2_parser *, char const *s); %type statement %type statements +%type conditional +%type elif +%type elifs %type words %type word @@ -51,45 +60,77 @@ static void yyerror(struct grub2_parser *, char const *s); %token TOKEN_EOL %token TOKEN_DELIM %token TOKEN_WORD +%token TOKEN_EOF 0 %start script %debug %% -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; -statement: TOKEN_EOL { - $$ = NULL; +conditional: statement TOKEN_EOL "then" sep statements { + $$ = create_statement_conditional(parser, $1, $5); + } + +elif: "elif" TOKEN_DELIM conditional { + $$ = $3; + } + +elifs: /* empty */ { + $$ = create_statements(parser); } - | words TOKEN_EOL { + | elifs elif { + statement_append($1, $2); + $$ = $1; + } + +statement: + words { $$ = create_statement_simple(parser, $1); } | '{' statements '}' { $$ = create_statement_block(parser, $2); } - | "if" TOKEN_DELIM statement - "then" TOKEN_EOL + | "if" TOKEN_DELIM conditional elifs "fi" { + $$ = create_statement_if(parser, $3, $4, NULL); + } + | "if" TOKEN_DELIM conditional + elifs + "else" sep statements - "fi" TOKEN_EOL { - $$ = create_statement_if(parser, $3, $6, NULL); + "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); + } words: word { $$ = create_argv(parser); @@ -114,6 +155,13 @@ void yyerror(struct grub2_parser *parser, char const *s) s, yyget_text(parser->scanner)); } +static void print_token(FILE *fp, int type, YYSTYPE value) +{ + if (type != TOKEN_WORD) + return; + fprintf(fp, "%s", value.word->text); +} + struct grub2_statements *create_statements(struct grub2_parser *parser) { struct grub2_statements *stmts = talloc(parser, @@ -145,18 +193,33 @@ struct grub2_statement *create_statement_menuentry(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; } @@ -166,11 +229,22 @@ 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; } +struct grub2_statement *create_statement_function(struct grub2_parser *parser, + struct grub2_word *name, struct grub2_statements *body) +{ + struct grub2_statement_function *stmt = + talloc(parser, struct grub2_statement_function); + stmt->st.exec = statement_function_execute; + stmt->name = name; + stmt->body = body; + return &stmt->st; +} + void statement_append(struct grub2_statements *stmts, struct grub2_statement *stmt) { @@ -221,13 +295,13 @@ void word_append(struct grub2_word *w1, struct grub2_word *w2) w1->last = w2; } -struct grub2_parser *grub2_parser_create(void *ctx) +struct grub2_parser *grub2_parser_create(struct discover_context *ctx) { struct grub2_parser *parser; parser = talloc(ctx, struct grub2_parser); yylex_init_extra(parser, &parser->scanner); - parser->script = create_script(parser); + parser->script = create_script(parser, ctx); return parser; } @@ -235,13 +309,15 @@ struct grub2_parser *grub2_parser_create(void *ctx) void grub2_parser_parse(struct grub2_parser *parser, char *buf, int len) { YY_BUFFER_STATE bufstate; + int rc; bufstate = yy_scan_bytes(buf, len - 1, parser->scanner); - yyparse(parser); + rc = yyparse(parser); yy_delete_buffer(bufstate, parser->scanner); - script_execute(parser->script); + if (!rc) + script_execute(parser->script); }