From 52d7a5d7bebd8a2eea8f1161800401662baf2f57 Mon Sep 17 00:00:00 2001 From: "Wolfgang (Blub) Bumiller" Date: Fri, 16 Nov 2012 20:32:03 +0100 Subject: [PATCH] Set the mergelines flag only for preprocessor commands --- ftepp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ftepp.c b/ftepp.c index b29b96b..50461e6 100644 --- a/ftepp.c +++ b/ftepp.c @@ -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; -- 2.39.2