From: BVK Chaitanya <bvk@dbook>
Date: Wed, 4 Aug 2010 13:52:40 +0000 (+0530)
Subject: merge with mainline
X-Git-Tag: 1.99~594^2~4^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc4ca99e2ecc99f5aaf47b420cf693d98ce04b0c;p=thirdparty%2Fgrub.git

merge with mainline
---

dc4ca99e2ecc99f5aaf47b420cf693d98ce04b0c
diff --cc script/yylex.l
index a084ba1fc,e9659832b..1a7084e53
--- a/script/yylex.l
+++ b/script/yylex.l
@@@ -116,11 -116,10 +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})+