merge with mainline

This commit is contained in:
BVK Chaitanya 2010-07-11 21:14:18 +05:30
commit 7925f8e9cf
170 changed files with 34663 additions and 3738 deletions

View file

@ -26,6 +26,7 @@
#define YYLTYPE_IS_TRIVIAL 0
#define YYENABLE_NLS 0
#include "grub_script.tab.h"
%}
%union {
@ -124,6 +125,7 @@ word: GRUB_PARSER_TOKEN_NAME { $$ = grub_script_add_arglist (state, 0, $1); }
statement: command { $$ = $1; }
| function { $$ = 0; }
| menuentry { $$ = $1; }
;
argument : "case" { $$ = grub_script_add_arglist (state, 0, $1); }
| "do" { $$ = grub_script_add_arglist (state, 0, $1); }