Better handling of line directive

ew-dm · ew-dm · commit 9cd5547a1f62 · 2019-05-03T18:48:06.000+02:00
diff --git a/simplecpp.cpp b/simplecpp.cpp
@@ -412,6 +412,23 @@ static bool isStringLiteralPrefix(const std::string &str)
            str == "R" || str == "uR" || str == "UR" || str == "LR" || str == "u8R";
 }
 
+void simplecpp::TokenList::lineDirective(unsigned int fileIndex, unsigned int line, Location *location)
+{
+    if (fileIndex != location->fileIndex || line >= location->line) {
+        location->fileIndex = fileIndex;
+        location->line = line;
+        return;
+    }
+
+    if (line + 2 >= location->line) {
+        location->line = line;
+        while (cback()->op != '#')
+            deleteToken(back());
+        deleteToken(back());
+        return;
+    }
+}
+
 void simplecpp::TokenList::readfile(std::istream &istr, const std::string &filename, OutputList *outputList)
 {
     std::stack<simplecpp::Location> loc;
@@ -468,23 +485,10 @@ void simplecpp::TokenList::readfile(std::istream &istr, const std::string &filen
                     location.fileIndex = fileIndex(cback()->str().substr(1U, cback()->str().size() - 2U));
                     location.line = 1U;
                 } else if (lastline == "# line %num%") {
-                    const Location loc1 = location;
-                    location.line = std::atol(cback()->str().c_str());
-                    if (location.line < loc1.line)
-                        location.line = loc1.line;
-                } else if (lastline == "# line %num% %str%") {
-                    const Location loc1 = location;
-                    location.fileIndex = fileIndex(cback()->str().substr(1U, cback()->str().size() - 2U));
-                    location.line = std::atol(cback()->previous->str().c_str());
-                    if (loc1.fileIndex == location.fileIndex && location.line < loc1.line)
-                        location.line = loc1.line;
-                } else if (lastline == "# %num% %str%") {
-                    const Location loc1 = location;
-                    loc.push(location);
-                    location.fileIndex = fileIndex(cback()->str().substr(1U, cback()->str().size() - 2U));
-                    location.line = std::atol(cback()->previous->str().c_str());
-                    if (loc1.fileIndex == location.fileIndex && location.line < loc1.line)
-                        location.line = loc1.line;
+                    lineDirective(location.fileIndex, std::atol(cback()->str().c_str()), &location);
+                } else if (lastline == "# %num% %str%" || lastline == "# line %num% %str%") {
+                    lineDirective(fileIndex(cback()->str().substr(1U, cback()->str().size() - 2U)),
+                                  std::atol(cback()->previous->str().c_str()), &location);
                 }
                 // #endfile
                 else if (lastline == "# endfile" && !loc.empty()) {
diff --git a/simplecpp.h b/simplecpp.h
@@ -265,6 +265,7 @@ namespace simplecpp {
         void constFoldQuestionOp(Token **tok1);
 
         std::string readUntil(std::istream &istr, const Location &location, const char start, const char end, OutputList *outputList, unsigned int bom);
+        void lineDirective(unsigned int fileIndex, unsigned int line, Location *location);
 
         std::string lastLine(int maxsize=100000) const;
 
diff --git a/test.cpp b/test.cpp
@@ -1027,12 +1027,21 @@ static void location2()
                   "#line 40 \"abc.y\"\n"
                   "{\n"
                   "}\n"
-                  "\n"
                   "{\n"
                   "}\n"
                   "} }", preprocess(code));
 }
 
+static void location3()
+{
+    const char *code;
+    code = "#line 1 \"x\" \n"
+           "a\n"
+           "#line 1 \"x\" \n"
+           "b\n";
+    ASSERT_EQUALS("\n#line 1 \"x\"\na b", preprocess(code));
+}
+
 static void missingHeader1()
 {
     const simplecpp::DUI dui;
@@ -1897,6 +1906,7 @@ int main(int argc, char **argv)
 
     TEST_CASE(location1);
     TEST_CASE(location2);
+    TEST_CASE(location3);
 
     TEST_CASE(missingHeader1);
     TEST_CASE(missingHeader2);
