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

more linenumber madness

Browse source
This commit is contained in:
Wolfgang Bumiller 2013-01-16 22:58:43 +01:00
parent b31e9b63eb
commit 7d2b0e9638
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ftepp.c
View file

@ -68,6 +68,7 @@ typedef struct {
char *itemname;
char *includename;
bool in_macro;
} ftepp_t;
/*
@ -646,6 +647,8 @@ static bool ftepp_macro_expand(ftepp_t *ftepp, ppmacro *macro, macroparam *param
size_t o, pi;
lex_file *inlex;
bool old_inmacro;
int nextok;
if (vararg_start < vec_size(params))
@ -728,21 +731,25 @@ static bool ftepp_macro_expand(ftepp_t *ftepp, ppmacro *macro, macroparam *param
inlex->line = ftepp->lex->line;
inlex->sline = ftepp->lex->sline;
ftepp->lex = inlex;
if (has_newlines)
if (has_newlines && !ftepp->in_macro)
ftepp_recursion_header(ftepp);
old_inmacro = ftepp->in_macro;
ftepp->in_macro = true;
if (!ftepp_preprocess(ftepp)) {
ftepp->in_macro = old_inmacro;
vec_free(ftepp->lex->open_string);
old_string = ftepp->output_string;
lex_close(ftepp->lex);
retval = false;
goto cleanup;
}
ftepp->in_macro = old_inmacro;
vec_free(ftepp->lex->open_string);
if (has_newlines)
if (has_newlines && !ftepp->in_macro)
ftepp_recursion_footer(ftepp);
if (resetline) {
if (resetline && !ftepp->in_macro) {
char lineno[128];
sprintf(lineno, "\n#pragma line(%lu)\n", old_lexer->sline);
sprintf(lineno, "\n#pragma line(%lu)\n", (unsigned long)(old_lexer->sline));
ftepp_out(ftepp, lineno, false);
}
old_string = ftepp->output_string;
@ -1550,7 +1557,7 @@ static bool ftepp_preprocess(ftepp_t *ftepp)
break;
case TOKEN_WHITE:
/* same as default but don't set newline=false */
ftepp_out(ftepp, ftepp_tokval(ftepp), false);
ftepp_out(ftepp, ftepp_tokval(ftepp), true);
ftepp_next(ftepp);
break;
default: