add/update tests

Author: ludviggunne

test.cpp

@@ -137,7 +137,7 @@ static std::string preprocess(const char code[], std::size_t size, const simplec
     std::vector<std::string> files;
     simplecpp::FileDataCache cache;
     simplecpp::TokenList tokens = makeTokenList(code, size, files, file);
-    if (dui.removeComments)
+    if (dui.removeSourceComments)
         tokens.removeComments();
     simplecpp::TokenList tokens2(files);
     simplecpp::preprocess(tokens2, tokens, files, cache, dui, outputList, macroUsage, ifCond);
@@ -528,7 +528,6 @@ static void comment()
 static void comment_multiline()
 {
     simplecpp::DUI dui;
-    dui.removeComments = true;
 
     const char code[] = "#define ABC {// \\\n"
                         "}\n"
@@ -562,6 +561,27 @@ static void comment_multiline()
     ASSERT_EQUALS("// abc\ndef", readfile("// abc\\\ndef"));
 }
 
+static void keep_comments()
+{
+    simplecpp::DUI dui;
+    dui.removeSourceComments = false;
+
+    {
+        const char code[] = "/* comment */\n";
+        ASSERT_EQUALS("/* comment */", preprocess(code,dui));
+    }
+
+    {
+        const char code[] = "// comment\n";
+        ASSERT_EQUALS("// comment", preprocess(code,dui));
+    }
+
+    {
+        const char code[] = "#define MACRO /* comment */\nMACRO\n";
+        ASSERT_EQUALS("\n/* comment */", preprocess(code,dui));
+    }
+}
+
 
 static void constFold()
 {
@@ -664,7 +684,6 @@ static void define6()
 static void define7()
 {
     simplecpp::DUI dui;
-    dui.removeComments = true;
 
     const char code[] = "#define A(X) X+1\n"
                         "A(1 /*23*/)";
@@ -1989,7 +2008,6 @@ static void has_include_2()
                         "  #endif\n"
                         "#endif";
     simplecpp::DUI dui;
-    dui.removeComments = true; // TODO: remove this
     dui.includePaths.emplace_back(testSourceDir);
     ASSERT_EQUALS("\n\nA", preprocess(code, dui)); // we default to latest standard internally
     dui.std = "c++14";
@@ -2613,7 +2631,6 @@ static void missingHeader4()
     const char code[] = "#/**/include <>\n";
     simplecpp::OutputList outputList;
     simplecpp::DUI dui;
-    dui.removeComments = true; // TODO: remove this
     ASSERT_EQUALS("", preprocess(code, dui, &outputList));
     ASSERT_EQUALS("file0,1,syntax_error,No header in #include\n", toString(outputList));
 }
@@ -4066,6 +4083,7 @@ static void runTests(int argc, char **argv, Input input)
 
     TEST_CASE(comment);
     TEST_CASE(comment_multiline);
+    TEST_CASE(keep_comments);
 
     TEST_CASE(constFold);