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 6ed12ce8474a14787137c4a1b035342d6aefc29e..aca474af3e96e286deed352230d557e3d246d808 100644 (file)
--- 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);