darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2025-02-22 11:21:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

call ftepp_recursion_header/footer only when there are newlines in the expanded macro

Browse source
This commit is contained in:
Wolfgang Bumiller 2013-01-15 22:03:16 +01:00
parent f8f4ad8ee5
commit dfa6d0c9ad
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ftepp.c
View file

@ -640,6 +640,7 @@ static bool ftepp_macro_expand(ftepp_t *ftepp, ppmacro *macro, macroparam *param
lex_file *old_lexer = ftepp->lex; lex_file *old_lexer = ftepp->lex;
size_t vararg_start = vec_size(macro->params); size_t vararg_start = vec_size(macro->params);
bool retval = true; bool retval = true;
bool has_newlines;
size_t varargs; size_t varargs;
size_t o, pi; size_t o, pi;
@ -712,6 +713,7 @@ static bool ftepp_macro_expand(ftepp_t *ftepp, ppmacro *macro, macroparam *param
} }
} }
vec_push(ftepp->output_string, 0); vec_push(ftepp->output_string, 0);
has_newlines = (strchr(ftepp->output_string, '\n') != NULL);
/* Now run the preprocessor recursively on this string buffer */ /* Now run the preprocessor recursively on this string buffer */
/* /*
printf("__________\n%s\n=========\n", ftepp->output_string); printf("__________\n%s\n=========\n", ftepp->output_string);
@ -726,7 +728,8 @@ static bool ftepp_macro_expand(ftepp_t *ftepp, ppmacro *macro, macroparam *param
inlex->line = ftepp->lex->line; inlex->line = ftepp->lex->line;
inlex->sline = ftepp->lex->sline; inlex->sline = ftepp->lex->sline;
ftepp->lex = inlex; ftepp->lex = inlex;
ftepp_recursion_header(ftepp); if (has_newlines)
ftepp_recursion_header(ftepp);
if (!ftepp_preprocess(ftepp)) { if (!ftepp_preprocess(ftepp)) {
vec_free(ftepp->lex->open_string); vec_free(ftepp->lex->open_string);
old_string = ftepp->output_string; old_string = ftepp->output_string;
@ -735,7 +738,8 @@ static bool ftepp_macro_expand(ftepp_t *ftepp, ppmacro *macro, macroparam *param
goto cleanup; goto cleanup;
} }
vec_free(ftepp->lex->open_string); vec_free(ftepp->lex->open_string);
ftepp_recursion_footer(ftepp); if (has_newlines)
ftepp_recursion_footer(ftepp);
old_string = ftepp->output_string; old_string = ftepp->output_string;
cleanup: cleanup: