removed support for #file/#endfile [skip ci]

Author: firewave

lib/cppcheck.cpp

@@ -1124,15 +1124,7 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
                     codeWithoutCfg = preprocessor.getcode(currentConfig, files, true);
                 });
 
-                if (startsWith(codeWithoutCfg,"#file"))
-                    codeWithoutCfg.insert(0U, "//");
                 std::string::size_type pos = 0;
-                while ((pos = codeWithoutCfg.find("\n#file",pos)) != std::string::npos)
-                    codeWithoutCfg.insert(pos+1U, "//");
-                pos = 0;
-                while ((pos = codeWithoutCfg.find("\n#endfile",pos)) != std::string::npos)
-                    codeWithoutCfg.insert(pos+1U, "//");
-                pos = 0;
                 while ((pos = codeWithoutCfg.find(Preprocessor::macroChar,pos)) != std::string::npos)
                     codeWithoutCfg[pos] = ' ';
                 mErrorLogger.reportOut(codeWithoutCfg, Color::Reset);

test/cli/other_test.py

@@ -3986,3 +3986,41 @@ def test_max_configs(tmp_path, max_configs, number_of_configs, check_config, exp
             '{}:0:0: information: Too many #ifdef configurations - cppcheck only checks {} of {} configurations. Use --force to check all configurations. [toomanyconfigs]'
             .format(test_file, max_configs, number_of_configs)
         ]
+
+
+# The implementation for "A::a" is missing - so don't check if "A::b" is used or not
+def test_unused_private_function_incomplete_impl(tmpdir):
+    test_inc = os.path.join(tmpdir, 'test.h')
+    with open(test_inc, 'wt') as f:
+        f.write(
+            """
+            class A
+            {
+            public:
+                A();
+                void a();
+            private:
+                void b();
+            };
+            """)
+
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt') as f:
+        f.write(
+            """
+            #include "test.h"
+            
+            A::A() { }
+            void A::b() { }
+            """)
+
+    args = [
+        '-q',
+        '--template=simple',
+        test_file
+    ]
+
+    ret, stdout, stderr = cppcheck(args)
+    assert stdout == ''
+    assert stderr.splitlines() == []
+    assert ret == 0, stdout

test/testpreprocessor.cpp

@@ -135,7 +135,7 @@ class TestPreprocessor : public TestFixture {
             cfgs = preprocessor.getConfigs();
         for (const std::string & config : cfgs) {
             try {
-                const bool writeLocations = (strstr(code, "#file") != nullptr) || (strstr(code, "#include") != nullptr);
+                const bool writeLocations = (strstr(code, "#include") != nullptr);
                 cfgcode[config] = preprocessor.getcode(config, files, writeLocations);
             } catch (const simplecpp::Output &) {
                 cfgcode[config] = "";

test/testunusedprivfunc.cpp

@@ -58,7 +58,6 @@ class TestUnusedPrivateFunction : public TestFixture {
 
         TEST_CASE(classInClass);
         TEST_CASE(sameFunctionNames);
-        TEST_CASE(incompleteImplementation);
 
         TEST_CASE(derivedClass);   // skip warning for derived classes. It might be a virtual function.
 
@@ -482,24 +481,6 @@ class TestUnusedPrivateFunction : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
-    void incompleteImplementation() {
-        // The implementation for "A::a" is missing - so don't check if
-        // "A::b" is used or not
-        check("#file \"test.h\"\n"
-              "class A\n"
-              "{\n"
-              "public:\n"
-              "    A();\n"
-              "    void a();\n"
-              "private:\n"
-              "    void b();\n"
-              "};\n"
-              "#endfile\n"
-              "A::A() { }\n"
-              "void A::b() { }");
-        ASSERT_EQUALS("", errout_str());
-    }
-
     void derivedClass() {
         // skip warning in derived classes in case the base class is invisible
         check("class derived : public base\n"