From: Wolfgang (Blub) Bumiller <blub@speed.at>
Date: Fri, 16 Nov 2012 19:32:03 +0000 (+0100)
Subject: Set the mergelines flag only for preprocessor commands
X-Git-Tag: 0.1.9~404^2~46
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=52d7a5d7bebd8a2eea8f1161800401662baf2f57;p=xonotic%2Fgmqcc.git

Set the mergelines flag only for preprocessor commands
---

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;