vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

pull-in block-arg again

Browse source
This commit is contained in:
BVK Chaitanya 2010-07-22 23:18:28 +05:30
commit 7f18804f07
2 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
script/parser.y
View file

@ -80,7 +80,7 @@
%token <arg> GRUB_PARSER_TOKEN_WORD "word" %token <arg> GRUB_PARSER_TOKEN_WORD "word"
%type <arg> block block0 %type <arg> block block0
%type <arglist> word argument parameters0 parameters1 arguments0 arguments1 %type <arglist> word argument arguments0 arguments1
%type <cmd> script_init script %type <cmd> script_init script
%type <cmd> grubcmd ifclause ifcmd forcmd whilecmd untilcmd %type <cmd> grubcmd ifclause ifcmd forcmd whilecmd untilcmd
@ -233,22 +233,7 @@ arguments1: argument arguments0
} }
; ;
parameters1: argument parameters0 grubcmd: word arguments0 block0
{
if ($1 && $2)
{
$1->next = $2;
$1->argcount += $2->argcount;
$2->argcount = 0;
}
$$ = $1;
}
;
parameters0: /* Empty */ { $$ = 0; }
| parameters1 { $$ = $1; }
;
grubcmd: word parameters0 block0
{ {
struct grub_script_arglist *x = $2; struct grub_script_arglist *x = $2;

2
script/script.c
View file

@ -97,7 +97,7 @@ grub_script_free (struct grub_script *script)
struct grub_script *s; struct grub_script *s;
struct grub_script *t; struct grub_script *t;
if (!script) if (! script)
return; return;
if (script->mem) if (script->mem)