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

make parenthesis as valid word characters

Browse source
This commit is contained in:
BVK Chaitanya 2010-01-25 22:01:14 +05:30
parent 6c624ae848
commit 37effddaf3
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog.lexer-rewrite
View file

@ -1,3 +1,8 @@
2010-01-25 BVK Chaitanya <bvk.groups@gmail.com>
* script/yylex.l: Accept parenthesis as part of word.
* script/parser.y: Remove GRUB_PARSER_TOKEN_{LPAR,RPAR} tokens.
2010-01-10 BVK Chaitanya <bvk.groups@gmail.com> 2010-01-10 BVK Chaitanya <bvk.groups@gmail.com>
* conf/any-emu.rmk: Build rule updates. * conf/any-emu.rmk: Build rule updates.

2
script/parser.y
View file

@ -45,8 +45,6 @@
%token GRUB_PARSER_TOKEN_PIPE "|" %token GRUB_PARSER_TOKEN_PIPE "|"
%token GRUB_PARSER_TOKEN_AMP "&" %token GRUB_PARSER_TOKEN_AMP "&"
%token GRUB_PARSER_TOKEN_SEMI ";" %token GRUB_PARSER_TOKEN_SEMI ";"
%token GRUB_PARSER_TOKEN_LPAR "("
%token GRUB_PARSER_TOKEN_RPAR ")"
%token GRUB_PARSER_TOKEN_LBR "{" %token GRUB_PARSER_TOKEN_LBR "{"
%token GRUB_PARSER_TOKEN_RBR "}" %token GRUB_PARSER_TOKEN_RBR "}"
%token GRUB_PARSER_TOKEN_NOT "!" %token GRUB_PARSER_TOKEN_NOT "!"

4
script/yylex.l
View file

@ -128,7 +128,7 @@ typedef grub_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:]_]*
@ -157,8 +157,6 @@ WORD ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
"|" { RECORD; return GRUB_PARSER_TOKEN_PIPE; } "|" { RECORD; return GRUB_PARSER_TOKEN_PIPE; }
"&" { RECORD; return GRUB_PARSER_TOKEN_AMP; } "&" { RECORD; return GRUB_PARSER_TOKEN_AMP; }
";" { RECORD; return GRUB_PARSER_TOKEN_SEMI; } ";" { RECORD; return GRUB_PARSER_TOKEN_SEMI; }
"(" { RECORD; return GRUB_PARSER_TOKEN_LPAR; }
")" { RECORD; return GRUB_PARSER_TOKEN_RPAR; }
"<" { RECORD; return GRUB_PARSER_TOKEN_LT; } "<" { RECORD; return GRUB_PARSER_TOKEN_LT; }
">" { RECORD; return GRUB_PARSER_TOKEN_GT; } ">" { RECORD; return GRUB_PARSER_TOKEN_GT; }