From: Jeremy Kerr <jk@ozlabs.org>
Date: Tue, 17 Sep 2013 06:36:43 +0000 (+0800)
Subject: discover/grub2: fix comment handling
X-Git-Tag: v1.0.0~447
X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=bda4feeab43ec0ef8bf2bf63d54d81ab54f3ba51

discover/grub2: fix comment handling

Remove '#' from the list of word chars. Also, don't need the '$' char in
the comment regex

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---

diff --git a/discover/grub2/lexer.l b/discover/grub2/lexer.l
index 6ed12ce..aca474a 100644
--- a/discover/grub2/lexer.l
+++ b/discover/grub2/lexer.l
@@ -21,7 +21,7 @@
 %x sqstring
 %x dqstring
 
-WORD	[^{}|&$;<> \t\n'"]+
+WORD	[^{}|&$;<> \t\n'"#]+
 VARNAME ([[:alpha:]][_[:alnum:]]*|[0-9]|[\?@\*#])
 
 %%
@@ -116,8 +116,7 @@ VARNAME ([[:alpha:]][_[:alnum:]]*|[0-9]|[\?@\*#])
 [ \t]*(;|\n)[ \t]*	return TOKEN_EOL;
 
  /* strip comments */
-#.*$	;
-
+#.*	;
 
 .	printf("unknown token '%s'\n", yytext); exit(1);