OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glcpp: Factor out a tiny bit of repeated code.

Browse Source 
This function is getting a little long too read. Simplify it by pulling
up one assignment from every condition.

Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Carl Worth
2012-11-28 12:03:50 -08:00
parent 907a10378e
commit ea34ac499d
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/glsl/glcpp/glcpp-parse.y
View File

@@ -1528,6 +1528,7 @@ _glcpp_parser_expand_node (glcpp_parser_t *parser,
return NULL; return NULL;
} }
*last = node;
identifier = token->value.str; identifier = token->value.str;
/* Special handling for __LINE__ and __FILE__, (not through /* Special handling for __LINE__ and __FILE__, (not through
@@ -1541,7 +1542,6 @@ _glcpp_parser_expand_node (glcpp_parser_t *parser,
node->token->location.first_line); node->token->location.first_line);
_token_list_append (replacement, value); _token_list_append (replacement, value);
*last = node;
return replacement; return replacement;
} }
@@ -1554,7 +1554,6 @@ _glcpp_parser_expand_node (glcpp_parser_t *parser,
node->token->location.source); node->token->location.source);
_token_list_append (replacement, value); _token_list_append (replacement, value);
*last = node;
return replacement; return replacement;
} }
@@ -1579,14 +1578,12 @@ _glcpp_parser_expand_node (glcpp_parser_t *parser,
final = _token_create_str (parser, OTHER, str); final = _token_create_str (parser, OTHER, str);
expansion = _token_list_create (parser); expansion = _token_list_create (parser);
_token_list_append (expansion, final); _token_list_append (expansion, final);
*last = node;
return expansion; return expansion;
} }
if (! macro->is_function) if (! macro->is_function)
{ {
token_list_t *replacement; token_list_t *replacement;
*last = node;
/* Replace a macro defined as empty with a SPACE token. */ /* Replace a macro defined as empty with a SPACE token. */
if (macro->replacements == NULL) if (macro->replacements == NULL)