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

block argument support

Browse source
This commit is contained in:
BVK Chaitanya 2010-04-30 12:09:31 +05:30
parent fd5df0f9ab
commit 19dd394f56
4 changed files with 55 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/grub/script_sh.h
View file

@ -49,7 +49,8 @@ typedef enum
GRUB_SCRIPT_ARG_TYPE_TEXT, GRUB_SCRIPT_ARG_TYPE_TEXT,
GRUB_SCRIPT_ARG_TYPE_DQVAR, GRUB_SCRIPT_ARG_TYPE_DQVAR,
GRUB_SCRIPT_ARG_TYPE_DQSTR, GRUB_SCRIPT_ARG_TYPE_DQSTR,
GRUB_SCRIPT_ARG_TYPE_SQSTR GRUB_SCRIPT_ARG_TYPE_SQSTR,
GRUB_SCRIPT_ARG_TYPE_BLOCK
} grub_script_arg_type_t; } grub_script_arg_type_t;
/* A part of an argument. */ /* A part of an argument. */
@ -59,6 +60,9 @@ struct grub_script_arg
char *str; char *str;
/* Parsed block argument. */
struct grub_script_cmd *block;
/* Next argument part. */ /* Next argument part. */
struct grub_script_arg *next; struct grub_script_arg *next;
}; };

1
script/execute.c
View file

@ -152,6 +152,7 @@ grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist, int *c
} }
break; break;
case GRUB_SCRIPT_ARG_TYPE_BLOCK:
case GRUB_SCRIPT_ARG_TYPE_TEXT: case GRUB_SCRIPT_ARG_TYPE_TEXT:
if (grub_strlen (arg->str) > 0) if (grub_strlen (arg->str) > 0)
{ {

50
script/parser.y
View file

@ -74,7 +74,7 @@
%token <arg> GRUB_PARSER_TOKEN_NAME "name" %token <arg> GRUB_PARSER_TOKEN_NAME "name"
%token <arg> GRUB_PARSER_TOKEN_WORD "word" %token <arg> GRUB_PARSER_TOKEN_WORD "word"
%type <arglist> word argument arguments0 arguments1 %type <arglist> word argument block parameters0 parameters1 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
@ -147,6 +147,27 @@ argument : "case" { $$ = grub_script_add_arglist (state, 0, $1); }
| word { $$ = $1; } | word { $$ = $1; }
; ;
block: "{"
{
grub_script_lexer_ref (state->lexerstate);
$<offset>$ = grub_script_lexer_record_start (state);
}
commands1 delimiters0 "}"
{
char *p;
struct grub_script_arg *arg;
grub_script_lexer_deref (state->lexerstate);
if (p = grub_script_lexer_record_stop (state, $<offset>2))
*grub_strrchr (p, '}') = '\0';
if (arg = grub_script_arg_add (state, 0, GRUB_SCRIPT_ARG_TYPE_BLOCK, p))
arg->block = $3;
$$ = grub_script_add_arglist (state, 0, arg);
}
;
arguments0: /* Empty */ { $$ = 0; } arguments0: /* Empty */ { $$ = 0; }
| arguments1 { $$ = $1; } | arguments1 { $$ = $1; }
; ;
@ -162,7 +183,32 @@ arguments1: argument arguments0
} }
; ;
grubcmd: word arguments0 parameters1: argument parameters0
{
if ($1 && $2)
{
$1->next = $2;
$1->argcount += $2->argcount;
$2->argcount = 0;
}
$$ = $1;
}
| block parameters0
{
if ($1 && $2)
{
$1->next = $2;
$1->argcount += $2->argcount;
$2->argcount = 0;
}
$$ = $1;
}
;
parameters0: /* Empty */ { $$ = 0; }
| parameters1 { $$ = $1; }
;
grubcmd: word parameters0
{ {
if ($1 && $2) { if ($1 && $2) {
$1->next = $2; $1->next = $2;

2
script/yylex.l
View file

@ -114,7 +114,7 @@ typedef size_t yy_size_t;
BLANK [ \t] BLANK [ \t]
COMMENT ^[ \t]*#.*$ COMMENT ^[ \t]*#.*$
CHAR [^|&$;<> \t\n\'\"\\] CHAR [^{}|&$;<> \t\n\'\"\\]
DIGITS [[:digit:]]+ DIGITS [[:digit:]]+
NAME [[:alpha:]_][[:alnum:][:digit:]_]* NAME [[:alpha:]_][[:alnum:][:digit:]_]*