PreprocessorHelper: write locations in getcode() when #include is encountered

Author: firewave

test/helpers.cpp

@@ -27,6 +27,7 @@
 
 #include <cerrno>
 #include <cstdio>
+#include <cstring>
 #include <iostream>
 #include <fstream>
 #include <list>
@@ -152,8 +153,8 @@ std::map<std::string, std::string> PreprocessorHelper::getcode(const Settings& s
         cfgs = preprocessor.getConfigs(tokens);
     for (const std::string & config : cfgs) {
         try {
-            // TODO: also preserve location information when #include exists - enabling that will fail since #line is treated like a regular token
-            cfgcode[config] = preprocessor.getcode(tokens, config, files, std::string(code).find("#file") != std::string::npos);
+            const bool writeLocations = (strstr(code, "#file") != nullptr) || (strstr(code, "#include") != nullptr);
+            cfgcode[config] = preprocessor.getcode(tokens, config, files, writeLocations);
         } catch (const simplecpp::Output &) {
             cfgcode[config] = "";
         }

test/testpreprocessor.cpp

@@ -2658,7 +2658,6 @@ class TestPreprocessor : public TestFixture {
         }
     }
 
-    // TODO: fails because the location information is not be preserved by PreprocessorHelper::getcode()
     void writeLocations()
     {
         const char inc[] = "class A {\n"
@@ -2668,17 +2667,13 @@ class TestPreprocessor : public TestFixture {
         const char code[] = R"(#include "test.h")";
         ScopedFile header("test.h", inc);
         const std::string processed = PreprocessorHelper::getcodeforcfg(settingsDefault, *this, code, "", "test.cpp");
-        TODO_ASSERT_EQUALS(
+        ASSERT_EQUALS(
                "\n"
                "#line 1 \"test.h\"\n"
                "class A {\n"
                "public :\n"
                "void f ( ) { }\n"
                "} ;",
-               "class A {\n"
-               "public :\n"
-               "void f ( ) { }\n"
-               "} ;",
                processed);
     }
 };