X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fgrub2%2Flexer.l;h=6c0a456e6503137f2be5c466e2b57d396fc3d33e;hp=64eee279a3d0f3311c5c3cfe9770dfb5bd69797d;hb=d808f5d2ec8e232d736a5f811d647df91e2a5b43;hpb=ce2275ed4fa099035af123c25a1a7657f1ea6e78;ds=sidebyside

diff --git a/discover/grub2/lexer.l b/discover/grub2/lexer.l
index 64eee27..6c0a456 100644
--- a/discover/grub2/lexer.l
+++ b/discover/grub2/lexer.l
@@ -6,11 +6,13 @@
 %}
 
 %option nounput noinput
+%option batch never-interactive
 %option warn
 %option noyywrap
 %option stack noyy_top_state
 %option reentrant
 %option bison-bridge
+%option yylineno
 %option noyyalloc noyyfree noyyrealloc
 %option extra-type="struct grub2_parser *"
 %option header-file="lexer.h"
@@ -36,6 +38,7 @@ VARNAME ([[:alpha:]][_[:alnum:]]*|[0-9]|[\?@\*#])
 "do"         return TOKEN_DO;
 "done"       return TOKEN_DONE;
 "elif"       return TOKEN_ELIF;
+"else"       return TOKEN_ELSE;
 "esac"       return TOKEN_ESAC;
 "fi"         return TOKEN_FI;
 "for"        return TOKEN_FOR;
@@ -51,15 +54,19 @@ VARNAME ([[:alpha:]][_[:alnum:]]*|[0-9]|[\?@\*#])
 
  /* anything that's not a metachar: return as a plain word */
 {WORD}	{
-		yylval->word = create_word(yyget_extra(yyscanner), yytext,
-						false, false);
+		yylval->word = create_word_text(yyget_extra(yyscanner), yytext);
 		return TOKEN_WORD;
 	}
 
 \${VARNAME} |
 \$\{{VARNAME}\} {
-		yylval->word = create_word(yyget_extra(yyscanner), yytext,
-						true, true);
+		if (yytext[1] == '{') {
+			yytext[yyleng-1] = '\0';
+			yytext++;
+		}
+		yytext++;
+		yylval->word = create_word_var(yyget_extra(yyscanner), yytext,
+						true);
 		return TOKEN_WORD;
 	}
 
@@ -71,8 +78,7 @@ VARNAME ([[:alpha:]][_[:alnum:]]*|[0-9]|[\?@\*#])
 		yy_pop_state(yyscanner);
 	}
 <sqstring>[^']+ {
-		yylval->word = create_word(yyget_extra(yyscanner), yytext,
-						false, false);
+		yylval->word = create_word_text(yyget_extra(yyscanner), yytext);
 		return TOKEN_WORD;
 	}
 
@@ -83,11 +89,22 @@ VARNAME ([[:alpha:]][_[:alnum:]]*|[0-9]|[\?@\*#])
 <dqstring>\" {
 		yy_pop_state(yyscanner);
 	}
-<dqstring>([^"]|\\\")+ {
-		yylval->word = create_word(yyget_extra(yyscanner), yytext,
-						true, false);
+<dqstring>([^"\$]|\\\")+ {
+		yylval->word = create_word_text(yyget_extra(yyscanner), yytext);
 		return TOKEN_WORD;
 	}
+<dqstring>\${VARNAME} |
+<dqstring>\$\{{VARNAME}\} {
+		if (yytext[1] == '{') {
+			yytext[yyleng-1] = '\0';
+			yytext++;
+		}
+		yytext++;
+		yylval->word = create_word_var(yyget_extra(yyscanner), yytext,
+						false);
+		return TOKEN_WORD;
+	}
+
 
 
  /* blocks */