fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-29 08:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Prevent unexpanded macros from being expanded again in the future.

Browse source 
With this fix, tests 37 - 39 now pass.
This commit is contained in:
Carl Worth 2010-05-26 08:15:49 -07:00
parent c9dcc08d45
commit ec4ada01c0
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
glcpp-parse.y
View file

@ -676,8 +676,17 @@ _glcpp_parser_expand_token_onto (glcpp_parser_t *parser,
/* Finally, don't expand this macro if we're already actively
* expanding it, (to avoid infinite recursion). */
if (_string_list_contains (parser->active, identifier, NULL)) {
_token_list_append (result, token);
if (_string_list_contains (parser->active, identifier, NULL))
{
/* We change the token type here from IDENTIFIER to
* OTHER to prevent any future expansion of this
* unexpanded token. */
char *str;
token_t *new_token;
str = xtalloc_strdup (result, token->value.str);
new_token = _token_create_str (result, OTHER, str);
_token_list_append (result, new_token);
return 0;
}