improved testing of #line handling

Author: firewave

simplecpp.cpp

@@ -700,19 +700,26 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
                 if (!isLastLinePreprocessor())
                     continue;
                 const std::string lastline(lastLine());
+                // #file "file.c"
                 if (lastline == "# file %str%") {
                     const Token *strtok = cback();
                     while (strtok->comment)
                         strtok = strtok->previous;
                     loc.push(location);
                     location.fileIndex = fileIndex(strtok->str().substr(1U, strtok->str().size() - 2U));
                     location.line = 1U;
-                } else if (lastline == "# line %num%") {
+                }
+                // #line 3
+                // TODO: add support for "# 3"
+                else if (lastline == "# line %num%") {
                     const Token *numtok = cback();
                     while (numtok->comment)
                         numtok = numtok->previous;
                     lineDirective(location.fileIndex, std::atol(numtok->str().c_str()), &location);
-                } else if (lastline == "# %num% %str%" || lastline == "# line %num% %str%") {
+                }
+                // # 3 "file.c" - not supported by Visual Studio
+                // #line 3 "file.c"
+                else if (lastline == "# %num% %str%" || lastline == "# line %num% %str%") {
                     const Token *strtok = cback();
                     while (strtok->comment)
                         strtok = strtok->previous;
@@ -722,7 +729,7 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
                     lineDirective(fileIndex(replaceAll(strtok->str().substr(1U, strtok->str().size() - 2U),"\\\\","\\")),
                                   std::atol(numtok->str().c_str()), &location);
                 }
-                // #endfile
+                // #endfile - only supported by Visual Studio(?)
                 else if (lastline == "# endfile" && !loc.empty()) {
                     location = loc.top();
                     loc.pop();

test.cpp

@@ -2061,6 +2061,76 @@ static void location5()
                   "int x ;", preprocess(code));
 }
 
+static void location6()
+{
+    const char code[] =
+        "#line 3\n"
+        "__LINE__ __FILE__\n";
+    ASSERT_EQUALS("\n"
+                  "\n"
+                  "3 \"\"",
+                  preprocess(code));
+}
+
+static void location7()
+{
+    const char code[] =
+        "#line 3 \"file.c\"\n"
+        "__LINE__ __FILE__\n";
+    ASSERT_EQUALS("\n"
+                  "#line 3 \"file.c\"\n"
+                  "3 \"file.c\"",
+                  preprocess(code));
+}
+
+static void location8()
+{
+    const char code[] =
+        "# 3\n"
+        "__LINE__ __FILE__\n";
+    ASSERT_EQUALS("\n"
+                  "2 \"\"", // TODO: should say 3
+                  preprocess(code));
+}
+
+static void location9()
+{
+    const char code[] =
+        "# 3 \"file.c\"\n"
+        "__LINE__ __FILE__\n";
+    ASSERT_EQUALS("\n"
+                  "#line 3 \"file.c\"\n"
+                  "3 \"file.c\"",
+                  preprocess(code));
+}
+
+static void location10()
+{
+    const char code[] =
+        "#line 3\n"
+        "__LINE__ __FILE__\n";
+    ASSERT_EQUALS("\n"
+                  "\n" // TODO: should this have the #line marker?
+                  "3 \"\"",
+                  preprocess(code));
+}
+
+static void location11()
+{
+    const char code[] =
+        "#line 3 \"file.c\"\n"
+        "__LINE__ __FILE__\n"
+        "#line 33 \"file2.c\"\n"
+        "__LINE__ __FILE__\n";
+    ASSERT_EQUALS("\n"
+                  "#line 3 \"file.c\"\n"
+                  "3 \"file.c\"\n"
+                  "#line 33 \"file2.c\"\n"
+                  "33 \"file2.c\"",
+                  preprocess(code));
+}
+
+
 static void missingHeader1()
 {
     const char code[] = "#include \"notexist.h\"\n";
@@ -3489,6 +3559,12 @@ int main(int argc, char **argv)
     TEST_CASE(location3);
     TEST_CASE(location4);
     TEST_CASE(location5);
+    TEST_CASE(location6);
+    TEST_CASE(location7);
+    TEST_CASE(location8);
+    TEST_CASE(location9);
+    TEST_CASE(location10);
+    TEST_CASE(location11);
 
     TEST_CASE(missingHeader1);
     TEST_CASE(missingHeader2);