some minor fixes

This commit is contained in:
BVK Chaitanya 2010-06-12 11:12:38 +05:30
parent b06f83e3ba
commit 94606d3845

View file

@ -105,6 +105,7 @@ typedef size_t yy_size_t;
%option nounistd nostdinit nodefault noyylineno %option nounistd nostdinit nodefault noyylineno
/* Reduce lexer size, by not defining these. */ /* Reduce lexer size, by not defining these. */
%option noyy_top_state
%option noinput nounput %option noinput nounput
%option noyyget_in noyyset_in %option noyyget_in noyyset_in
%option noyyget_out noyyset_out %option noyyget_out noyyset_out
@ -179,13 +180,13 @@ MULTILINE {WORD}?((\"{DQCHR}*)|(\'{SQCHR}*))
{NAME} { RECORD; return GRUB_PARSER_TOKEN_NAME; } {NAME} { RECORD; return GRUB_PARSER_TOKEN_NAME; }
{WORD} { {WORD} {
RECORD; RECORD;
yyextra->lexerstate->resplit = 1;
yypush_buffer_state (YY_CURRENT_BUFFER, yyscanner); yypush_buffer_state (YY_CURRENT_BUFFER, yyscanner);
if (grub_lexer_resplit (yytext, yyscanner)) if (grub_lexer_resplit (yytext, yyscanner))
{ {
yypop_buffer_state (yyscanner); yypop_buffer_state (yyscanner);
return GRUB_PARSER_TOKEN_WORD; return GRUB_PARSER_TOKEN_WORD;
} }
yyextra->lexerstate->resplit = 1;
} }
{MULTILINE} { {MULTILINE} {
if (grub_lexer_unput (yytext, yyscanner)) if (grub_lexer_unput (yytext, yyscanner))
@ -352,10 +353,7 @@ grub_lexer_unput (const char *text, yyscan_t yyscanner)
struct grub_lexer_param *lexerstate = yyget_extra (yyscanner)->lexerstate; struct grub_lexer_param *lexerstate = yyget_extra (yyscanner)->lexerstate;
if (lexerstate->prefix) if (lexerstate->prefix)
{
grub_free (lexerstate->prefix); grub_free (lexerstate->prefix);
lexerstate->prefix = 0;
}
lexerstate->prefix = grub_strdup (text); lexerstate->prefix = grub_strdup (text);
if (! lexerstate->prefix) if (! lexerstate->prefix)