Fix ref qualifiers for methods

cppcheckpremium-suppressions

@@ -98,7 +98,7 @@ premium-misra-cpp-2023-6.7.1
 premium-misra-cpp-2023-6.8.3
 
 # FIXME enforce proper ref qualifications
-premium-misra-cpp-2023-6.8.4
+# premium-misra-cpp-2023-6.8.4
 
 # We intentionally use the standard integer types
 premium-misra-cpp-2023-6.9.2

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;
         }

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;
+    }
+    std::string name() && {
         return mName;
     }
 

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;
+    }
+    std::map<nonneg int, VariableUsage> varUsage() && {
         return mVarUsage;
     }
     void addVar(const Variable *var, VariableType type, bool write_);

lib/cppcheck.cpp

@@ -1513,7 +1513,7 @@ void CppCheck::executeAddonsWholeProgram(const std::list<FileWithDetails> &files
     }
 }
 
-Settings &CppCheck::settings()
+Settings &CppCheck::settings() &
 {
     return mSettings;
 }

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.

lib/errorlogger.h

@@ -92,7 +92,10 @@ 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;
+        }
+        std::string getinfo() && {
             return mInfo;
         }
 
@@ -181,18 +184,27 @@ 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;
+    }
+    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;
+    }
+    std::string verboseMessage() && {
         return mVerboseMessage;
     }
 
     /** Symbol names */
-    const std::string &symbolNames() const {
+    const std::string &symbolNames() const & {
+        return mSymbolNames;
+    }
+    std::string symbolNames() && {
         return mSymbolNames;
     }
 

lib/filesettings.h

@@ -45,12 +45,20 @@ class FileWithDetails
             throw std::runtime_error("empty path specified");
     }
 
-    const std::string& path() const
+    const std::string& path() const &
+    {
+        return mPath;
+    }
+    std::string path() &&
     {
         return mPath;
     }
 
-    const std::string& spath() const
+    const std::string& spath() const &
+    {
+        return mPathSimplified;
+    }
+    std::string spath() &&
     {
         return mPathSimplified;
     }
@@ -77,12 +85,22 @@ struct CPPCHECKLIB FileSettings {
 
     std::string cfg;
     FileWithDetails file;
-    const std::string& filename() const
+    const std::string& filename() const &
+    {
+        // cppcheck-suppress returnTempReference
+        return file.path();
+    }
+    std::string filename() &&
     {
         return file.path();
     }
     // cppcheck-suppress unusedFunction
-    const std::string& sfilename() const
+    const std::string& sfilename() const &
+    {
+        // cppcheck-suppress returnTempReference
+        return file.spath();
+    }
+    std::string sfilename() &&
     {
         return file.spath();
     }

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 {
+        std::string start() && {
+            return mStart;
+        }
+        const std::string& end() const & {
+            return mEnd;
+        }
+        std::string end() && {
             return mEnd;
         }
         int offset() const {

lib/programmemory.h

@@ -84,9 +84,10 @@ struct ExprIdToken {
         return !(lhs < rhs);
     }
 
-    const Token& operator*() const NOEXCEPT {
+    const Token& operator*() const&  NOEXCEPT {
         return *tok;
     }
+    Token operator*() && NOEXCEPT;
 
     const Token* operator->() const NOEXCEPT {
         return tok;

lib/suppressions.cpp

@@ -524,11 +524,6 @@ std::list<SuppressionList::Suppression> SuppressionList::getUnmatchedGlobalSuppr
     return result;
 }
 
-const std::list<SuppressionList::Suppression> &SuppressionList::getSuppressions() const
-{
-    return mSuppressions;
-}
-
 void SuppressionList::markUnmatchedInlineSuppressionsAsChecked(const Tokenizer &tokenizer) {
     int currLineNr = -1;
     int currFileIdx = -1;

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;
+        }
+        std::string getFileName() && {
             return mFileName;
         }
         int lineNumber;
@@ -241,7 +244,12 @@ 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 & {
+        return mSuppressions;
+    }
+    std::list<Suppression> getSuppressions() && {
+        return mSuppressions;
+    }
 
     /**
      * @brief Marks Inline Suppressions as checked if source line is in the token stream

lib/symboldatabase.cpp

@@ -6220,7 +6220,7 @@ Type* Scope::findType(const std::string& name)
 
 //---------------------------------------------------------------------------
 
-Scope *Scope::findInNestedListRecursive(const std::string & name)
+Scope *Scope::findInNestedListRecursive(const std::string & name) &
 {
     auto it = std::find_if(nestedList.cbegin(), nestedList.cend(), [&](const Scope* s) {
         return s->className == name;

lib/symboldatabase.h

@@ -540,7 +540,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;
+    }
+    std::vector<Dimension> dimensions() && {
         return mDimensions;
     }
 
@@ -1146,7 +1149,7 @@ class CPPCHECKLIB Scope {
      * @brief find if name is in nested list
      * @param name name of nested scope
      */
-    Scope *findInNestedListRecursive(const std::string & name);
+    Scope *findInNestedListRecursive(const std::string & name) &;
 
     void addVariable(const Token *token_, const Token *start_,
                      const Token *end_, AccessControl access_, const Type *type_,
@@ -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;
+    }
+    std::vector<const Variable *> variableList() && {
         return mVariableList;
     }
 

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;
+    }
+    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;
+        }
+        std::string scope() && {
             return mScope;
         }
-        const std::string & name() const {
+        const std::string & name() const & {
             return mName;
         }
-        const std::string & fullName() const {
+        std::string name() && {
+            return mName;
+        }
+        const std::string & fullName() const & {
+            return mFullName;
+        }
+        std::string fullName() && {
             return mFullName;
         }
         const Token * nameToken() const {

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;
+    }
+    std::string str() && {
         return mStr;
     }
 

lib/tokenize.cpp

@@ -2534,7 +2534,7 @@ namespace {
             return false;
         }
 
-        ScopeInfo3 * findScope(const ScopeInfo3 * scope) {
+        ScopeInfo3 * findScope(const ScopeInfo3 * scope) & {
             if (scope->bodyStart == bodyStart)
                 return this;
             for (auto & child : children) {
@@ -4178,7 +4178,7 @@ namespace {
         const std::unordered_map<std::string, nonneg int>& map(bool global) const {
             return global ? mVariableId_global : mVariableId;
         }
-        nonneg int& getVarId() {
+        nonneg int& getVarId() & {
             return mVarId;
         }
     };

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;
+    }
+    std::vector<std::string> getFiles() && {
         return mFiles;
     }
 

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;
         }

lib/vf_analyzers.cpp

@@ -882,7 +882,7 @@ struct MultiValueFlowAnalyzer : ValueFlowAnalyzer {
                 return &mIt->second;
             }
 
-            Iterator &operator++() {
+            Iterator &operator++() & {
                 // cppcheck-suppress postfixOperator - forward iterator needs to perform post-increment
                 mIt++;
                 return *this;
@@ -926,7 +926,10 @@ struct MultiValueFlowAnalyzer : ValueFlowAnalyzer {
         }
     }
 
-    virtual const std::unordered_map<nonneg int, const Variable*>& getVars() const {
+    virtual const std::unordered_map<nonneg int, const Variable*>& getVars() const & {
+        return vars;
+    }
+    virtual std::unordered_map<nonneg int, const Variable*> getVars() && {
         return vars;
     }
 
@@ -1073,11 +1076,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;
+    }
+    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;
+    }
+    std::unordered_map<nonneg int, const Variable*> getAliasedVars() && {
         return aliases;
     }