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

mergelines flag for the lexer to handle a backslash-newline

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

3
ftepp.c
View file

@ -576,7 +576,8 @@ static bool ftepp_preprocess(ftepp_t *ftepp)
bool newline = true;
ftepp->lex->flags.preprocessing = true;
ftepp->lex->flags.noops = true;
ftepp->lex->flags.mergelines = true;
ftepp->lex->flags.noops = true;
ftepp_next(ftepp);
do

15
lexer.c
View file

@ -675,7 +675,20 @@ int lex_do(lex_file *lex)
return TOKEN_FATAL;
#endif
ch = lex_skipwhite(lex);
while (true) {
ch = lex_skipwhite(lex);
if (!lex->flags.mergelines || ch != '\\')
break;
ch = lex_getch(lex);
if (ch != '\n') {
lex_ungetch(lex, ch);
ch = '\\';
break;
}
/* we reached a linemerge */
continue;
}
lex->sline = lex->line;
lex->tok.ctx.line = lex->sline;
lex->tok.ctx.file = lex->name;

1
lexer.h
View file

@ -119,6 +119,7 @@ typedef struct {
bool noops;
bool nodigraphs; /* used when lexing string constants */
bool preprocessing; /* whitespace and EOLs become actual tokens */
bool mergelines; /* backslash at the end of a line escapes the newline */
} flags;
int framevalue;