change matching

Author: wjakobsson

lib/analyzerinfo.cpp

@@ -21,7 +21,6 @@
 #include "errorlogger.h"
 #include "filesettings.h"
 #include "path.h"
-#include "utils.h"
 
 #include <array>
 #include <cstring>
@@ -197,23 +196,16 @@ std::string AnalyzerInformation::skipAnalysis(const tinyxml2::XMLDocument &analy
 
 std::string AnalyzerInformation::getAnalyzerInfoFileFromFilesTxt(std::istream& filesTxt, const std::string &sourcefile, const std::string &cfg, size_t fsFileId)
 {
-    // An exact match wins, the suffix match is only a fallback for paths spelled differently than in
-    // files.txt. Otherwise "processexecutor.cpp" matches the "executor.cpp" line and both share one file.
     const std::string simplifiedSourcefile = Path::simplifyPath(sourcefile);
-    std::string suffixMatch;
     std::string line;
     while (std::getline(filesTxt,line)) {
         AnalyzerInformation::Info filesTxtInfo;
         if (!filesTxtInfo.parse(line))
             continue; // TODO: report error?
-        if (filesTxtInfo.cfg != cfg || filesTxtInfo.fsFileId != fsFileId)
-            continue;
-        if (simplifiedSourcefile == filesTxtInfo.sourceFile)
+        if (filesTxtInfo.sourceFile == simplifiedSourcefile && filesTxtInfo.cfg == cfg && filesTxtInfo.fsFileId == fsFileId)
             return filesTxtInfo.afile;
-        if (suffixMatch.empty() && endsWith(simplifiedSourcefile, filesTxtInfo.sourceFile))
-            suffixMatch = filesTxtInfo.afile;
     }
-    return suffixMatch;
+    return "";
 }
 
 std::string AnalyzerInformation::getAnalyzerInfoFile(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, std::size_t fsFileId)

test/testanalyzerinformation.cpp

@@ -54,8 +54,8 @@ class TestAnalyzerInformation : public TestFixture {
         f.str(filesTxt);
         ASSERT_EQUALS("file1.a4", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f, "./file1.c", "", 0));
 
-        // an exact match wins over a suffix match - "executor.cpp" is a suffix of
-        // "processexecutor.cpp" so both used to resolve to the same analyzer info file
+        // only an exact match is used - "executor.cpp" is a suffix of "processexecutor.cpp"
+        // so both used to resolve to the same analyzer info file
         {
             constexpr char suffixTxt[] = "executor.a1:::executor.cpp\n"
                                          "processexecutor.a2:::processexecutor.cpp\n";
@@ -75,11 +75,11 @@ class TestAnalyzerInformation : public TestFixture {
             ASSERT_EQUALS("executor.a2", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f2, "executor.cpp", "", 0));
         }
 
-        // a suffix match is still used when there is no exact match
+        // a path that only ends with the path in files.txt is not a match
         {
             constexpr char relTxt[] = "a.a1:::src/a.c\n";
             std::istringstream f1(relTxt);
-            ASSERT_EQUALS("a.a1", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f1, "/home/proj/src/a.c", "", 0));
+            ASSERT_EQUALS("", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f1, "/home/proj/src/a.c", "", 0));
         }
 
         // no match at all