Partial fix

danmar · Aug 12, 2024 · a8c2c5d · a8c2c5d
1 parent c3fc22a
commit a8c2c5d
Show file tree

Hide file tree

Showing 16 changed files with 104 additions and 28 deletions.
diff --git a/lib/analyzer.h b/lib/analyzer.h
@@ -110,7 +110,7 @@ struct Analyzer {
             return get(Match);
         }
 
-        Action& operator|=(Action a) {
+        Action& operator|=(Action a) & {
             set(a.mFlag);
             return *this;
         }

diff --git a/lib/check.h b/lib/check.h
@@ -85,7 +85,10 @@ class CPPCHECKLIB Check {
     virtual void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const = 0;
 
     /** class name, used to generate documentation */
-    const std::string& name() const {
+    const std::string& name() const & {
+        return mName;
+    }
+    const std::string& name() && {
         return mName;
     }
 

diff --git a/lib/checkunusedvar.cpp b/lib/checkunusedvar.cpp
@@ -147,7 +147,10 @@ class Variables {
     void clear() {
         mVarUsage.clear();
     }
-    const std::map<nonneg int, VariableUsage> &varUsage() const {
+    const std::map<nonneg int, VariableUsage> &varUsage() const & {
+        return mVarUsage;
+    }
+    const std::map<nonneg int, VariableUsage> &varUsage() && {
         return mVarUsage;
     }
     void addVar(const Variable *var, VariableType type, bool write_);

diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
@@ -1511,7 +1511,7 @@ void CppCheck::executeAddonsWholeProgram(const std::list<FileWithDetails> &files
     }
 }
 
-Settings &CppCheck::settings()
+Settings &CppCheck::settings()&
 {
     return mSettings;
 }

diff --git a/lib/cppcheck.h b/lib/cppcheck.h
@@ -110,7 +110,7 @@ class CPPCHECKLIB CppCheck : ErrorLogger {
      * @brief Get reference to current settings.
      * @return a reference to current settings
      */
-    Settings &settings();
+    Settings &settings()&;
 
     /**
      * @brief Returns current version number as a string.

diff --git a/lib/errorlogger.h b/lib/errorlogger.h
@@ -92,7 +92,11 @@ class CPPCHECKLIB ErrorMessage {
         int line; // negative value means "no line"
         unsigned int column;
 
-        const std::string& getinfo() const {
+        const std::string& getinfo() const & {
+            return mInfo;
+        }
+
+        const std::string& getinfo() && {
             return mInfo;
         }
 
@@ -181,18 +185,30 @@ class CPPCHECKLIB ErrorMessage {
     void setmsg(const std::string &msg);
 
     /** Short message (single line short message) */
-    const std::string &shortMessage() const {
+    const std::string &shortMessage() const & {
+        return mShortMessage;
+    }
+
+    const std::string &shortMessage() && {
         return mShortMessage;
     }
 
     /** Verbose message (may be the same as the short message) */
     // cppcheck-suppress unusedFunction - used by GUI only
-    const std::string &verboseMessage() const {
+    const std::string &verboseMessage() const & {
+        return mVerboseMessage;
+    }
+
+    const std::string &verboseMessage() && {
         return mVerboseMessage;
     }
 
     /** Symbol names */
-    const std::string &symbolNames() const {
+    const std::string &symbolNames() const & {
+        return mSymbolNames;
+    }
+
+    const std::string &symbolNames() && {
         return mSymbolNames;
     }
 

diff --git a/lib/filesettings.h b/lib/filesettings.h
@@ -45,12 +45,21 @@ class FileWithDetails
             throw std::runtime_error("empty path specified");
     }
 
-    const std::string& path() const
+    const std::string& path() const &
     {
         return mPath;
     }
 
-    const std::string& spath() const
+    const std::string& path() &&
+    {
+        return mPath;
+    }
+
+    const std::string& spath() const &
+    {
+        return mPathSimplified;
+    }
+    const std::string& spath() &&
     {
         return mPathSimplified;
     }

diff --git a/lib/library.cpp b/lib/library.cpp
@@ -88,10 +88,16 @@ struct Library::LibraryData
         void addBlock(const char* blockName) {
             mBlocks.insert(blockName);
         }
-        const std::string& start() const {
+        const std::string& start() const & {
             return mStart;
         }
-        const std::string& end() const {
+        const std::string& start() && {
+            return mStart;
+        }
+        const std::string& end() const & {
+            return mEnd;
+        }
+        const std::string& end() && {
             return mEnd;
         }
         int offset() const {

diff --git a/lib/suppressions.cpp b/lib/suppressions.cpp
@@ -517,7 +517,12 @@ std::list<SuppressionList::Suppression> SuppressionList::getUnmatchedGlobalSuppr
     return result;
 }
 
-const std::list<SuppressionList::Suppression> &SuppressionList::getSuppressions() const
+const std::list<SuppressionList::Suppression> &SuppressionList::getSuppressions() const &
+{
+    return mSuppressions;
+}
+
+const std::list<SuppressionList::Suppression> &SuppressionList::getSuppressions() &&
 {
     return mSuppressions;
 }

diff --git a/lib/suppressions.h b/lib/suppressions.h
@@ -52,7 +52,10 @@ class CPPCHECKLIB SuppressionList {
         std::size_t hash;
         std::string errorId;
         void setFileName(std::string s);
-        const std::string &getFileName() const {
+        const std::string &getFileName() const& {
+            return mFileName;
+        }
+        const std::string &getFileName() && {
             return mFileName;
         }
         int lineNumber;
@@ -241,7 +244,8 @@ class CPPCHECKLIB SuppressionList {
      * @brief Returns list of all suppressions.
      * @return list of suppressions
      */
-    const std::list<Suppression> &getSuppressions() const;
+    const std::list<Suppression> &getSuppressions() const&;
+    const std::list<Suppression> &getSuppressions() &&;
 
     /**
      * @brief Marks Inline Suppressions as checked if source line is in the token stream

diff --git a/lib/symboldatabase.h b/lib/symboldatabase.h
@@ -534,7 +534,10 @@ class CPPCHECKLIB Variable {
      * Get array dimensions.
      * @return array dimensions vector
      */
-    const std::vector<Dimension> &dimensions() const {
+    const std::vector<Dimension> &dimensions() const& {
+        return mDimensions;
+    }
+    const std::vector<Dimension> &dimensions() && {
         return mDimensions;
     }
 
@@ -1373,7 +1376,10 @@ class CPPCHECKLIB SymbolDatabase {
         return mVariableList.at(varId);
     }
 
-    const std::vector<const Variable *> & variableList() const {
+    const std::vector<const Variable *> & variableList() const& {
+        return mVariableList;
+    }
+    const std::vector<const Variable *> & variableList() && {
         return mVariableList;
     }
 

diff --git a/lib/templatesimplifier.h b/lib/templatesimplifier.h
@@ -50,7 +50,10 @@ class CPPCHECKLIB TemplateSimplifier {
 public:
     explicit TemplateSimplifier(Tokenizer &tokenizer);
 
-    const std::string& dump() const {
+    const std::string& dump() const & {
+        return mDump;
+    }
+    const std::string& dump() && {
         return mDump;
     }
 
@@ -169,13 +172,22 @@ class CPPCHECKLIB TemplateSimplifier {
         void token(Token * token) {
             mToken = token;
         }
-        const std::string & scope() const {
+        const std::string & scope() const & {
+            return mScope;
+        }
+        const std::string & scope() && {
             return mScope;
         }
-        const std::string & name() const {
+        const std::string & name() const & {
             return mName;
         }
-        const std::string & fullName() const {
+        const std::string & name() && {
+            return mName;
+        }
+        const std::string & fullName() const & {
+            return mFullName;
+        }
+        const std::string & fullName() && {
             return mFullName;
         }
         const Token * nameToken() const {

diff --git a/lib/token.h b/lib/token.h
@@ -203,7 +203,10 @@ class CPPCHECKLIB Token {
      */
     void concatStr(std::string const& b);
 
-    const std::string &str() const {
+    const std::string &str() const & {
+        return mStr;
+    }
+    const std::string &str() && {
         return mStr;
     }
 

diff --git a/lib/tokenlist.h b/lib/tokenlist.h
@@ -139,7 +139,10 @@ class CPPCHECKLIB TokenList {
      * The first filename is the filename for the sourcefile
      * @return vector with filenames
      */
-    const std::vector<std::string>& getFiles() const {
+    const std::vector<std::string>& getFiles() const & {
+        return mFiles;
+    }
+    const std::vector<std::string>& getFiles() && {
         return mFiles;
     }
 

diff --git a/lib/tokenrange.h b/lib/tokenrange.h
@@ -47,7 +47,7 @@ class TokenRangeBase {
         T* mt;
         TokenIterator() : mt(nullptr) {}
         explicit TokenIterator(T* t) : mt(t) {}
-        TokenIterator& operator++() {
+        TokenIterator& operator++() & {
             mt = mt->next();
             return *this;
         }

diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
@@ -759,7 +759,7 @@ class SelectValueFromVarIdMapRange {
             return &mIt->second;
         }
 
-        Iterator &operator++() {
+        Iterator &operator++() & {
             // cppcheck-suppress postfixOperator - forward iterator needs to perform post-increment
             mIt++;
             return *this;
@@ -1529,11 +1529,17 @@ struct SingleValueFlowAnalyzer : ValueFlowAnalyzer {
 
     SingleValueFlowAnalyzer(ValueFlow::Value v, const Settings& s) : ValueFlowAnalyzer(s), value(std::move(v)) {}
 
-    const std::unordered_map<nonneg int, const Variable*>& getVars() const {
+    const std::unordered_map<nonneg int, const Variable*>& getVars() const & {
+        return varids;
+    }
+    const std::unordered_map<nonneg int, const Variable*>& getVars() && {
         return varids;
     }
 
-    const std::unordered_map<nonneg int, const Variable*>& getAliasedVars() const {
+    const std::unordered_map<nonneg int, const Variable*>& getAliasedVars() const & {
+        return aliases;
+    }
+    const std::unordered_map<nonneg int, const Variable*>& getAliasedVars() && {
         return aliases;
     }