NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

glcpp: Build a reentrant parser.

Browse source
This commit is contained in:
Kenneth Graunke 2010-06-16 16:26:28 -07:00
parent b673ff91ab
commit e0e429fca3
3 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
glcpp/glcpp-parse.y
View file

@ -133,13 +133,15 @@ _glcpp_parser_skip_stack_pop (glcpp_parser_t *parser);
#define yylex glcpp_parser_lex
static int
glcpp_parser_lex (glcpp_parser_t *parser);
glcpp_parser_lex (YYSTYPE *yylval, glcpp_parser_t *parser);
static void
glcpp_parser_lex_from (glcpp_parser_t *parser, token_list_t *list);
%}
%pure-parser
%parse-param {glcpp_parser_t *parser}
%lex-param {glcpp_parser_t *parser}
@ -1449,13 +1451,13 @@ _define_function_macro (glcpp_parser_t *parser,
}
static int
glcpp_parser_lex (glcpp_parser_t *parser)
glcpp_parser_lex (YYSTYPE *yylval, glcpp_parser_t *parser)
{
token_node_t *node;
int ret;
if (parser->lex_from_list == NULL) {
ret = glcpp_lex (parser->scanner);
ret = glcpp_lex (yylval, parser->scanner);
/* XXX: This ugly block of code exists for the sole
* purpose of converting a NEWLINE token into a SPACE
@ -1501,7 +1503,7 @@ glcpp_parser_lex (glcpp_parser_t *parser)
{
macro_t *macro;
macro = hash_table_find (parser->defines,
yylval.str);
yylval->str);
if (macro && macro->is_function) {
parser->newline_as_space = 1;
parser->paren_count = 0;
@ -1519,7 +1521,7 @@ glcpp_parser_lex (glcpp_parser_t *parser)
return NEWLINE;
}
yylval = node->token->value;
*yylval = node->token->value;
ret = node->token->type;
parser->lex_from_node = node->next;