Make basepath a class member

Author: glankk

lib/importproject.cpp

@@ -45,7 +45,7 @@
 
 void ImportProject::ignorePaths(const std::vector<std::string> &ipaths, bool debug)
 {
-    PathMatch matcher(ipaths, mPath);
+    PathMatch matcher(ipaths);
     for (auto it = fileSettings.cbegin(); it != fileSettings.cend();) {
         if (matcher.match(it->filename())) {
             if (debug)

lib/pathmatch.cpp

@@ -57,6 +57,13 @@ static std::string translate(const std::string &s)
 
 PathMatch::PathMatch(const std::vector<std::string> &paths, const std::string &basepath, Mode mode)
 {
+    if (basepath.empty())
+        mBasepath = Path::getCurrentPath();
+    else if (Path::isAbsolute(basepath))
+        mBasepath = basepath;
+    else
+        mBasepath = Path::getCurrentPath() + "/" + basepath;
+
     if (mode == Mode::platform) {
 #ifdef _WIN32
         mode = Mode::icase;
@@ -74,12 +81,8 @@ PathMatch::PathMatch(const std::vector<std::string> &paths, const std::string &b
         if (!regex_string.empty())
             regex_string.push_back('|');
 
-        if (p.front() == '.') {
-            if (Path::isAbsolute(basepath))
-                p = basepath + "/" + p;
-            else
-                p = Path::getCurrentPath() + "/" + basepath + "/" + p;
-        }
+        if (p.front() == '.')
+                p = mBasepath + "/" + p;
 
         p = Path::fromNativeSeparators(p);
 
@@ -107,17 +110,15 @@ PathMatch::PathMatch(const std::vector<std::string> &paths, const std::string &b
         mRegex = std::regex(regex_string, std::regex_constants::extended);
 }
 
-bool PathMatch::match(const std::string &path, const std::string &basepath) const
+bool PathMatch::match(const std::string &path) const
 {
     std::string p;
     std::smatch m;
 
     if (Path::isAbsolute(path))
         p = Path::fromNativeSeparators(Path::simplifyPath(path));
-    else if (Path::isAbsolute(basepath))
-        p = Path::fromNativeSeparators(Path::simplifyPath(basepath + "/" + path));
     else
-        p = Path::fromNativeSeparators(Path::simplifyPath(Path::getCurrentPath() + "/" + basepath + "/" + path));
+        p = Path::fromNativeSeparators(Path::simplifyPath(mBasepath + "/" + path));
 
     return std::regex_search(p, m, mRegex, std::regex_constants::match_any | std::regex_constants::match_not_null);
 }

lib/pathmatch.h

@@ -40,9 +40,9 @@
  *    - Otherwise, match all files where the rule matches the file's simplified absolute path.
  *      Globs are allowed in the rule.
  *  - If a rule starts with '.':
- *    - The rule is interpreted as a path relative to `basepath`, which should be the execution directory for rules
- *      passed to the CLI, or the directory containing the project file when imported, and then converted to an
- *      absolute path and treated as such according to the above procedure.
+ *    - The rule is interpreted as a path relative to `basepath` and then converted to an absolute path and
+ *      treated as such according to the above procedure. If the rule is relative to some other directory, it should
+ *      be modified to be relative to `basepath` first (this should be done with rules in project files, for example).
  *  - Otherwise:
  *    - No simplification is done to the rule.
  *    - If the rule ends with a path separator:
@@ -83,8 +83,8 @@ class CPPCHECKLIB PathMatch {
      * If a path is a directory it needs to end with a file separator.
      *
      * @param paths List of masks.
-     * @param basepath Path to which matched paths are relative, when applicable. Can be relative, in which case it is
-     * appended to Path::getCurrentPath().
+     * @param basepath Path to which rules and matched paths are relative, when applicable. Can be relative, in which
+     * case it is appended to Path::getCurrentPath().
      * @param mode Case sensitivity mode.
      */
     explicit PathMatch(const std::vector<std::string> &paths, const std::string &basepath = std::string(), Mode mode = Mode::platform);
@@ -97,9 +97,10 @@ class CPPCHECKLIB PathMatch {
      * @param path Path to match.
      * @return true if any of the masks match the path, false otherwise.
      */
-    bool match(const std::string &path, const std::string &basepath = std::string()) const;
+    bool match(const std::string &path) const;
 
 private:
+    std::string mBasepath;
     std::regex mRegex;
 };