]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
pulled in menuentry branch for OPTION_REPEATABLE
authorBVK Chaitanya <bvk@dbook>
Wed, 4 Aug 2010 04:54:57 +0000 (10:24 +0530)
committerBVK Chaitanya <bvk@dbook>
Wed, 4 Aug 2010 04:54:57 +0000 (10:24 +0530)
1  2 
lib/arg.c
script/yylex.l

diff --cc lib/arg.c
Simple merge
diff --cc script/yylex.l
index e9659832bdca9b5fe1c17d6bf555a36f337e1d69,a084ba1fcf24628f1349bdfadb68c867c1bc9e48..1a7084e53535006a7895bbe021c47ff2da204f6a
@@@ -116,10 -116,11 +116,11 @@@ COMMENT         #.*
  
  CHAR            [^{}|&$;<> \t\n\'\"\\]
  DIGITS          [[:digit:]]+
 -NAME            [[:alpha:]_][[:alnum:][:digit:]_]*
 +NAME            [[:alpha:]_][[:alnum:]_]*
  
  ESC             \\.
- VARIABLE        ${NAME}|$\{{NAME}\}|${DIGITS}|$\{{DIGITS}\}|$\?|$\{\?\}
+ SPECIAL         \?|\#|\*|\@
+ VARIABLE        ${NAME}|$\{{NAME}\}|${DIGITS}|$\{{DIGITS}\}|${SPECIAL}|$\{{SPECIAL}\}
  DQSTR           \"([^\\\"]|{ESC})*\"
  SQSTR           \'[^\']*\'
  WORD            ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+