From: BVK Chaitanya <bvk@dbook>
Date: Thu, 12 Aug 2010 09:13:34 +0000 (+0530)
Subject: merge with mainline
X-Git-Tag: 1.99~601^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00a8a3eee3ec54e3d66469cca6021e5974b98b0b;p=thirdparty%2Fgrub.git

merge with mainline
---

00a8a3eee3ec54e3d66469cca6021e5974b98b0b
diff --cc script/yylex.l
index c580b1ed3,45760c158..45728dfb4
--- a/script/yylex.l
+++ b/script/yylex.l
@@@ -119,18 -116,15 +119,19 @@@ COMMENT         #.*
  
  CHAR            [^{}|&$;<> \t\n\'\"\\]
  DIGITS          [[:digit:]]+
- NAME            [[:alpha:]_][[:alnum:][:digit:]_]*
+ NAME            [[:alpha:]_][[:alnum:]_]*
  
 -ESC             \\.
 +ESC             \\(.|\n)
 +SQCHR           [^\']
 +DQCHR           {ESC}|[^\\\"]
 +DQSTR           \"{DQCHR}*\"
 +SQSTR           \'{SQCHR}*\'
- VARIABLE        ${NAME}|$\{{NAME}\}|${DIGITS}|$\{{DIGITS}\}|$\?|$\{\?\}
+ SPECIAL         \?|\#|\*|\@
+ VARIABLE        ${NAME}|$\{{NAME}\}|${DIGITS}|$\{{DIGITS}\}|${SPECIAL}|$\{{SPECIAL}\}
 -DQSTR           \"([^\\\"]|{ESC})*\"
 -SQSTR           \'[^\']*\'
  WORD            ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
  
 +MULTILINE       {WORD}?((\"{DQCHR}*)|(\'{SQCHR}*)|(\\\n))
 +
  %x              SPLIT
  %x              DQUOTE
  %x              SQUOTE