darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2025-04-05 01:11:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Set the mergelines flag only for preprocessor commands

Browse source
This commit is contained in:
Wolfgang (Blub) Bumiller 2012-11-16 20:32:03 +01:00
parent 053d8fb0e2
commit 52d7a5d7be
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ftepp.c
View file

@ -576,7 +576,7 @@ static bool ftepp_preprocess(ftepp_t *ftepp)
bool newline = true;
ftepp->lex->flags.preprocessing = true;
ftepp->lex->flags.mergelines = true;
ftepp->lex->flags.mergelines = false;
ftepp->lex->flags.noops = true;
ftepp_next(ftepp);
@ -595,6 +595,7 @@ static bool ftepp_preprocess(ftepp_t *ftepp)
ftepp_next(ftepp);
break;
}
ftepp->lex->flags.mergelines = true;
if (ftepp_next(ftepp) >= TOKEN_EOF) {
ftepp_error(ftepp, "error in preprocessor directive");
ftepp->token = TOKEN_ERROR;
@ -602,6 +603,7 @@ static bool ftepp_preprocess(ftepp_t *ftepp)
}
if (!ftepp_hash(ftepp))
ftepp->token = TOKEN_ERROR;
ftepp->lex->flags.mergelines = false;
break;
case TOKEN_EOL:
newline = true;