Handle '# %num% %str%' locations generated by gcc preprocessor

danmar · danmar · commit a765b88dc6aa · 2018-11-02T16:27:45.000+01:00
diff --git a/simplecpp.cpp b/simplecpp.cpp
@@ -439,7 +439,6 @@ void simplecpp::TokenList::readfile(std::istream &istr, const std::string &filen
             if (oldLastToken != cback()) {
                 oldLastToken = cback();
                 const std::string lastline(lastLine());
-
                 if (lastline == "# file %str%") {
                     loc.push(location);
                     location.fileIndex = fileIndex(cback()->str().substr(1U, cback()->str().size() - 2U));
@@ -451,6 +450,10 @@ void simplecpp::TokenList::readfile(std::istream &istr, const std::string &filen
                     loc.push(location);
                     location.fileIndex = fileIndex(cback()->str().substr(1U, cback()->str().size() - 2U));
                     location.line = std::atol(cback()->previous->str().c_str());
+                } else if (lastline == "# %num% %str%") {
+                    loc.push(location);
+                    location.fileIndex = fileIndex(cback()->str().substr(1U, cback()->str().size() - 2U));
+                    location.line = std::atol(cback()->previous->str().c_str());
                 }
                 // #endfile
                 else if (lastline == "# endfile" && !loc.empty()) {
diff --git a/test.cpp b/test.cpp
@@ -894,6 +894,15 @@ static void ifalt()   // using "and", "or", etc
     ASSERT_EQUALS("\n1", preprocess(code));
 }
 
+static void location1()
+{
+    const char *code;
+
+    code =  "# 1 \"main.c\"\n\n\n"
+            "x";
+    ASSERT_EQUALS("\n#line 3 \"main.c\"\nx", preprocess(code));
+}
+
 static void missingHeader1()
 {
     const simplecpp::DUI dui;
@@ -1626,6 +1635,8 @@ int main(int argc, char **argv)
     TEST_CASE(ifdiv0);
     TEST_CASE(ifalt); // using "and", "or", etc
 
+    TEST_CASE(location1);
+
     TEST_CASE(missingHeader1);
     TEST_CASE(missingHeader2);
     TEST_CASE(missingHeader3);
