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

linenumbers and macros are stupid

Browse source
This commit is contained in:
Wolfgang Bumiller 2013-01-16 23:34:54 +01:00
parent 7d2b0e9638
commit d5ba5a6e6a
1 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
ftepp.c
View file

@ -638,6 +638,7 @@ static bool ftepp_preprocess(ftepp_t *ftepp);
static bool ftepp_macro_expand(ftepp_t *ftepp, ppmacro *macro, macroparam *params, bool resetline) static bool ftepp_macro_expand(ftepp_t *ftepp, ppmacro *macro, macroparam *params, bool resetline)
{ {
char *old_string = ftepp->output_string; char *old_string = ftepp->output_string;
char *inner_string;
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;
@ -667,6 +668,7 @@ static bool ftepp_macro_expand(ftepp_t *ftepp, ppmacro *macro, macroparam *param
case TOKEN_VA_ARGS: case TOKEN_VA_ARGS:
if (!macro->variadic) { if (!macro->variadic) {
ftepp_error(ftepp, "internal preprocessor error: TOKEN_VA_ARGS in non-variadic macro"); ftepp_error(ftepp, "internal preprocessor error: TOKEN_VA_ARGS in non-variadic macro");
vec_free(old_string);
return false; return false;
} }
if (!varargs) if (!varargs)
@ -716,7 +718,6 @@ 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);
@ -727,33 +728,47 @@ static bool ftepp_macro_expand(ftepp_t *ftepp, ppmacro *macro, macroparam *param
retval = false; retval = false;
goto cleanup; goto cleanup;
} }
ftepp->output_string = old_string;
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;
if (has_newlines && !ftepp->in_macro)
ftepp_recursion_header(ftepp); old_inmacro = ftepp->in_macro;
old_inmacro = ftepp->in_macro;
ftepp->in_macro = true; ftepp->in_macro = true;
ftepp->output_string = NULL;
if (!ftepp_preprocess(ftepp)) { if (!ftepp_preprocess(ftepp)) {
ftepp->in_macro = old_inmacro; ftepp->in_macro = old_inmacro;
vec_free(ftepp->lex->open_string); vec_free(ftepp->lex->open_string);
old_string = ftepp->output_string; vec_free(ftepp->output_string);
lex_close(ftepp->lex); lex_close(ftepp->lex);
retval = false; retval = false;
goto cleanup; goto cleanup;
} }
ftepp->in_macro = old_inmacro; ftepp->in_macro = old_inmacro;
vec_free(ftepp->lex->open_string); vec_free(ftepp->lex->open_string);
if (has_newlines && !ftepp->in_macro) lex_close(ftepp->lex);
inner_string = ftepp->output_string;
ftepp->output_string = old_string;
has_newlines = (strchr(inner_string, '\n') != NULL);
if (has_newlines && !old_inmacro)
ftepp_recursion_header(ftepp);
vec_append(ftepp->output_string, vec_size(inner_string), inner_string);
vec_free(inner_string);
if (has_newlines && !old_inmacro)
ftepp_recursion_footer(ftepp); ftepp_recursion_footer(ftepp);
if (resetline && !ftepp->in_macro) { if (resetline && !ftepp->in_macro) {
char lineno[128]; char lineno[128];
sprintf(lineno, "\n#pragma line(%lu)\n", (unsigned long)(old_lexer->sline)); sprintf(lineno, "\n#pragma line(%lu)\n", (unsigned long)(old_lexer->sline));
ftepp_out(ftepp, lineno, false); ftepp_out(ftepp, lineno, false);
} }
old_string = ftepp->output_string;
old_string = ftepp->output_string;
cleanup: cleanup:
ftepp->lex = old_lexer; ftepp->lex = old_lexer;
ftepp->output_string = old_string; ftepp->output_string = old_string;