diff --git a/ChangeLog b/ChangeLog index e79b3a39d..77bf87739 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,33 @@ +2006-16-04 Marco Gerards + + * normal/command.c (grub_command_init): Remove the title command. + + * normal/lexer.c (grub_script_yylex): Renamed from this... + (grub_script_yylex2): ... to this. + (grub_script_yylex): New function. Temporary + introduced to filter some tokens. + (grub_script_yyerror): Print a newline. + + * normal/main.c (read_config_file): Output information about the + lines that contain errors. Wait for a key after all lines have + been processed. Don't return an empty menu. + + * normal/parser.y (func_mem): Don't initialize. + (menu_entry): Likewise. + (err): New variable. + (script): Don't return anything when an error was encountered. + (ws, returns): Removed rules. + (argument): Disabled concatenated variable support. + (arguments): Remove explicit separators. + (grubcmd): Likewise. + (function): Likewise. + (menuentry): Likewise. + (if): Likewise. + (commands): Likewise. Add error handling. + + * normal/script.c (grub_script_create_cmdline): If + `grub_script_parsed' is 0, assume the parser encountered an error. + 2006-04-02 Yoshinori K. Okuji * configure.ac: Add support for EFI. Fix the typo diff --git a/normal/command.c b/normal/command.c index 19179b41b..7cfac271a 100644 --- a/normal/command.c +++ b/normal/command.c @@ -357,9 +357,6 @@ lsmod_command (struct grub_arg_list *state __attribute__ ((unused)), void grub_command_init (void) { - /* This is a special command, because this never be called actually. */ - grub_register_command ("title", 0, GRUB_COMMAND_FLAG_TITLE, 0, 0, 0); - grub_register_command ("rescue", rescue_command, GRUB_COMMAND_FLAG_BOTH, "rescue", "Go back to the rescue mode.", 0); diff --git a/normal/lexer.c b/normal/lexer.c index 20e16dc9d..f23e5a300 100644 --- a/normal/lexer.c +++ b/normal/lexer.c @@ -140,8 +140,25 @@ nextchar (void) script++; } +int +grub_script_yylex2 (void); + int grub_script_yylex (void) +{ + int r = -1; + + while (r == -1) + { + r = grub_script_yylex2 (); + if (r == ' ' || r == '\n') + r = -1; + } + return r; +} + +int +grub_script_yylex2 (void) { grub_parser_state_t newstate; char use; @@ -345,5 +362,5 @@ grub_script_yylex (void) void grub_script_yyerror (char const *err) { - grub_printf (err); + grub_printf ("%s\n", err); } diff --git a/normal/main.c b/normal/main.c index eca6b32c7..355d28b82 100644 --- a/normal/main.c +++ b/normal/main.c @@ -164,6 +164,7 @@ read_config_file (const char *config) grub_file_t file; auto grub_err_t getline (char **line); int currline = 0; + int errors = 0; grub_err_t getline (char **line) { @@ -201,21 +202,18 @@ read_config_file (const char *config) while (get_line (file, cmdline, sizeof (cmdline))) { struct grub_script *parsed_script; + int startline; - currline++; + startline = ++currline; /* Execute the script, line for line. */ parsed_script = grub_script_parse (cmdline, getline); if (! parsed_script) { - /* Wait until the user pushes any key so that the user can - see what happened. */ - grub_printf ("\nPress any key to continue..."); - (void) grub_getkey (); - - grub_file_close (file); - return 0; + grub_printf ("(line %d-%d)\n", startline, currline); + errors++; + continue; } /* Execute the command(s). */ @@ -226,6 +224,22 @@ read_config_file (const char *config) } grub_file_close (file); + + if (errors > 0) + { + /* Wait until the user pushes any key so that the user can + see what happened. */ + grub_printf ("\nPress any key to continue..."); + (void) grub_getkey (); + } + + /* If the menu is empty, just drop it. */ + if (current_menu->size == 0) + { + grub_free (current_menu); + return 0; + } + return newmenu; } diff --git a/normal/parser.y b/normal/parser.y index 00491c4a2..08aae7605 100644 --- a/normal/parser.y +++ b/normal/parser.y @@ -26,9 +26,11 @@ #define YYMALLOC grub_malloc /* Keep track of the memory allocated for this specific function. */ -static struct grub_script_mem *func_mem = 0; +static struct grub_script_mem *func_mem; -static char *menu_entry = 0; +static char *menu_entry; + +static int err; %} @@ -56,9 +58,9 @@ static char *menu_entry = 0; %% /* It should be possible to do this in a clean way... */ -script: commands returns +script: { err = 0} commands { - grub_script_parsed = $1; + grub_script_parsed = err ? 0 : $2; } ; @@ -78,14 +80,6 @@ text: GRUB_PARSER_TOKEN_NAME } ; -ws: /* Empty */ - | ' ' -; - -returns: /* Empty */ - | '\n' -; - /* An argument can consist of some static text mixed with variables, for example: `foo${bar}baz'. */ argument: GRUB_PARSER_TOKEN_VAR @@ -96,33 +90,35 @@ argument: GRUB_PARSER_TOKEN_VAR { $$ = grub_script_arg_add (0, GRUB_SCRIPT_ARG_TYPE_STR, $1); } - | argument GRUB_PARSER_TOKEN_VAR - { - $$ = grub_script_arg_add ($1, GRUB_SCRIPT_ARG_TYPE_VAR, $2); - } - | argument text - { - $$ = grub_script_arg_add ($1, GRUB_SCRIPT_ARG_TYPE_STR, $2); - } +/* XXX: Currently disabled to simplify the parser. This should be + parsed by yet another parser for readibility. */ +/* | argument GRUB_PARSER_TOKEN_VAR */ +/* { */ +/* $$ = grub_script_arg_add ($1, GRUB_SCRIPT_ARG_TYPE_VAR, $2); */ +/* } */ +/* | argument text */ +/* { */ +/* $$ = grub_script_arg_add ($1, GRUB_SCRIPT_ARG_TYPE_STR, $2); */ +/* } */ ; arguments: argument { $$ = grub_script_add_arglist (0, $1); } - | arguments ' ' argument + | arguments argument { - $$ = grub_script_add_arglist ($1, $3); + $$ = grub_script_add_arglist ($1, $2); } ; -grubcmd: ws GRUB_PARSER_TOKEN_NAME ' ' arguments ws +grubcmd: GRUB_PARSER_TOKEN_NAME arguments { - $$ = grub_script_create_cmdline ($2, $4); + $$ = grub_script_create_cmdline ($1, $2); } - | ws GRUB_PARSER_TOKEN_NAME ws + | GRUB_PARSER_TOKEN_NAME { - $$ = grub_script_create_cmdline ($2, 0); + $$ = grub_script_create_cmdline ($1, 0); } ; @@ -130,7 +126,7 @@ grubcmd: ws GRUB_PARSER_TOKEN_NAME ' ' arguments ws command: grubcmd { $$ = $1; } | if { $$ = $1; } | function { $$ = 0; } - | menuentry { $$ = $1; } + | menuentry { $$ = $1; } ; /* A block of commands. */ @@ -138,58 +134,58 @@ commands: command { $$ = grub_script_add_cmd (0, $1); } - | commands ';' command + | command ';' commands { struct grub_script_cmdblock *cmd; cmd = (struct grub_script_cmdblock *) $1; $$ = grub_script_add_cmd (cmd, $3); } - | commands '\n' command - { - struct grub_script_cmdblock *cmd; - cmd = (struct grub_script_cmdblock *) $1; - $$ = grub_script_add_cmd (cmd, $3); + | error + { + yyerror ("Incorrect command"); + err = 1; + yyerrok; } ; /* A function. Carefully save the memory that is allocated. */ -function: "function" ' ' GRUB_PARSER_TOKEN_NAME +function: "function" GRUB_PARSER_TOKEN_NAME { grub_script_lexer_ref (); - } ws '{' returns + } '{' { /* The first part of the function was recognised. Now start recording the memory usage to store this function. */ func_mem = grub_script_mem_record (); - } commands returns '}' + } commands '}' { struct grub_script *script; /* All the memory usage for parsing this function was recorded. */ func_mem = grub_script_mem_record_stop (func_mem); - script = grub_script_create ($9, func_mem); + script = grub_script_create ($6, func_mem); if (script) - grub_script_function_create ($3, script); + grub_script_function_create ($2, script); grub_script_lexer_deref (); } ; /* A menu entry. Carefully save the memory that is allocated. */ -menuentry: "menuentry" ' ' argument +menuentry: "menuentry" argument { grub_script_lexer_ref (); - } ws '{' returns + } '{' { /* Record sourcecode of the menu entry. It can be parsed multiple times if it is part of a loop. */ grub_script_lexer_record_start (); - } commands returns '}' + } commands '}' { menu_entry = grub_script_lexer_record_stop (); - $$ = grub_script_create_cmdmenu ($3, menu_entry, 0); + $$ = grub_script_create_cmdmenu ($2, menu_entry, 0); grub_script_lexer_deref (); } ; @@ -200,14 +196,14 @@ if_statement: "if" { grub_script_lexer_ref (); } ; /* The if statement. */ -if: if_statement grubcmd ';' ws "then" returns commands returns "fi" +if: if_statement grubcmd ';' "then" commands "fi" { - $$ = grub_script_create_cmdif ($2, $7, 0); + $$ = grub_script_create_cmdif ($2, $5, 0); grub_script_lexer_deref (); } - | if_statement grubcmd ';' ws "then" returns commands returns "else" returns commands returns "fi" + | if_statement grubcmd ';' "then" commands "else" commands "fi" { - $$ = grub_script_create_cmdif ($2, $7, $11); + $$ = grub_script_create_cmdif ($2, $5, $7); grub_script_lexer_deref (); } ; diff --git a/normal/script.c b/normal/script.c index bbab94fe2..d427994a7 100644 --- a/normal/script.c +++ b/normal/script.c @@ -170,7 +170,6 @@ grub_script_create_cmdline (char *cmdname, struct grub_script_arglist *arglist) cmd = grub_script_malloc (sizeof (*cmd)); cmd->cmd.exec = grub_script_execute_cmdline; -/* cmd->cmd.free = grub_script_free_cmdline; */ cmd->cmd.next = 0; cmd->arglist = arglist; cmd->cmdname = cmdname; @@ -305,7 +304,7 @@ grub_script_parse (char *script, grub_err_t (*getline) (char **)) /* Parse the script, the result is stored in `grub_script_parsed'. */ - if (grub_script_yyparse ()) + if (grub_script_yyparse () || ! grub_script_parsed) { struct grub_script_mem *memfree; memfree = grub_script_mem_record_stop (membackup);