Switch to RefThunk

Author: pfultz2

Makefile

@@ -27,7 +27,7 @@
 
 #include "cmdlinelogger.h"
 #include "filesettings.h"
-#include "nonnullptr.h"
+#include "refthunk.h"
 #include "standards.h"
 #include "utils.h"
 
@@ -118,11 +118,11 @@ class CmdLineParser {
         T tmp;
         std::string err;
         if (!strToInt(arg + offset, tmp, &err)) {
-            mLogger->printError("argument to '" + std::string(arg, offset) + "' is not valid - " + err + ".");
+            mLogger().printError("argument to '" + std::string(arg, offset) + "' is not valid - " + err + ".");
             return false;
         }
         if (mustBePositive && tmp < 0) {
-            mLogger->printError("argument to '" + std::string(arg, offset) + "' needs to be a positive integer.");
+            mLogger().printError("argument to '" + std::string(arg, offset) + "' needs to be a positive integer.");
             return false;
         }
         num = tmp;
@@ -153,10 +153,10 @@ class CmdLineParser {
 
     void outputFormatOptionMixingError() const;
 
-    NonNullPtr<CmdLineLogger> mLogger;
+    RefThunk<CmdLineLogger> mLogger;
 
-    NonNullPtr<Settings> mSettings;
-    NonNullPtr<Suppressions> mSuppressions;
+    RefThunk<Settings> mSettings;
+    RefThunk<Suppressions> mSuppressions;
 
 protected:
     std::vector<std::string> mPathNames;

cli/cmdlineparser.cpp

@@ -26,7 +26,7 @@
 #include "infer.h"
 #include "library.h"
 #include "mathlib.h"
-#include "nonnullptr.h"
+#include "refthunk.h"
 #include "settings.h"
 #include "symboldatabase.h"
 #include "token.h"
@@ -3129,7 +3129,7 @@ namespace {
     };
 
     struct ExpressionChangedSkipDeadCode {
-        NonNullPtr<const Library> library;
+        RefThunk<const Library> library;
         const std::function<std::vector<MathLib::bigint>(const Token* tok)>* evaluate;
         ExpressionChangedSkipDeadCode(const Library& library,
                                       const std::function<std::vector<MathLib::bigint>(const Token* tok)>& evaluate)

cli/cmdlineparser.h

@@ -129,19 +129,19 @@ void CheckersReport::countCheckers()
     mActiveCheckersCount = mAllCheckersCount = 0;
 
     for (const auto& checkReq: checkers::allCheckers) {
-        if (mActiveCheckers->count(checkReq.first) > 0)
+        if (mActiveCheckers().count(checkReq.first) > 0)
             ++mActiveCheckersCount;
         ++mAllCheckersCount;
     }
-    for (const auto& addonInfo: mSettings->addonInfos) {
+    for (const auto& addonInfo: mSettings().addonInfos) {
         for (const auto& checkReq: addonInfo.checkers) {
-            if (mActiveCheckers->count(checkReq.first) > 0)
+            if (mActiveCheckers().count(checkReq.first) > 0)
                 ++mActiveCheckersCount;
             ++mAllCheckersCount;
         }
     }
 
-    if (mSettings->addons.count("misra")) {
+    if (mSettings().addons.count("misra")) {
         const bool doUnusedFunctionOnly = Settings::unusedFunctionOnly();
         for (const checkers::MisraInfo& info: checkers::misraC2012Rules) {
             const std::string rule = std::to_string(info.a) + "." + std::to_string(info.b);
@@ -185,20 +185,20 @@ std::string CheckersReport::getReport(const std::string& criticalErrors) const
     }
     for (const auto& checkReq: checkers::allCheckers) {
         const std::string& checker = checkReq.first;
-        const bool active = mActiveCheckers->count(checkReq.first) > 0;
+        const bool active = mActiveCheckers().count(checkReq.first) > 0;
         const std::string& req = checkReq.second;
         fout << (active ? "Yes  " : "No   ") << checker;
         if (!active && !req.empty())
             fout << std::string(maxCheckerSize + 4 - checker.size(), ' ') << "require:" + req;
         fout << std::endl;
     }
 
-    for (const auto& addonInfo: mSettings->addonInfos) {
+    for (const auto& addonInfo: mSettings().addonInfos) {
         if (addonInfo.checkers.empty())
             continue;
         fout << std::endl << std::endl;
         std::string title;
-        if (mSettings->premium && addonInfo.name == "premiumaddon.json")
+        if (mSettings().premium && addonInfo.name == "premiumaddon.json")
             title = "Cppcheck Premium";
         else {
             title = addonInfo.name;
@@ -217,7 +217,7 @@ std::string CheckersReport::getReport(const std::string& criticalErrors) const
 
         for (const auto& checkReq: addonInfo.checkers) {
             const std::string& checker = checkReq.first;
-            const bool active = mActiveCheckers->count(checkReq.first) > 0;
+            const bool active = mActiveCheckers().count(checkReq.first) > 0;
             const std::string& req = checkReq.second;
             fout << (active ? "Yes  " : "No   ") << checker;
             if (!active && !req.empty())
@@ -238,7 +238,7 @@ std::string CheckersReport::getXmlReport(const std::string& criticalErrors) cons
         ret += "    <critical-errors/>\n";
     ret += "    <checkers-report>\n";
     const int misraCVersion = getMisraCVersion(mSettings);
-    for (std::string checker: *mActiveCheckers) {
+    for (std::string checker: mActiveCheckers()) {
         if (checker.compare(0,8,"Misra C:") == 0)
             checker = "Misra C " + std::to_string(misraCVersion) + ":" + checker.substr(8);
         ret += "        <checker id=\"" + checker + "\"/>\n";

lib/astutils.cpp

@@ -20,7 +20,7 @@
 #define checkersReportH
 
 #include "config.h"
-#include "nonnullptr.h"
+#include "refthunk.h"
 
 #include <set>
 #include <string>
@@ -38,8 +38,8 @@ class CPPCHECKLIB CheckersReport {
     std::string getXmlReport(const std::string& criticalErrors) const;
 
 private:
-    NonNullPtr<const Settings> mSettings;
-    NonNullPtr<const std::set<std::string>> mActiveCheckers;
+    RefThunk<const Settings> mSettings;
+    RefThunk<const std::set<std::string>> mActiveCheckers;
 
     void countCheckers();
 

lib/checkersreport.cpp

@@ -24,7 +24,7 @@
 #include "fwdanalysis.h"
 #include "library.h"
 #include "mathlib.h"
-#include "nonnullptr.h"
+#include "refthunk.h"
 #include "platform.h"
 #include "settings.h"
 #include "standards.h"
@@ -4503,7 +4503,7 @@ struct UnionMember {
         : name(name)
         , size(size) {}
 
-    NonNullPtr<const std::string> name;
+    RefThunk<const std::string> name;
     size_t size;
 };
 
@@ -4513,7 +4513,7 @@ struct Union {
         , name(scope.className) {}
 
     const Scope *scope;
-    NonNullPtr<const std::string> name;
+    RefThunk<const std::string> name;
     std::vector<UnionMember> members;
 
     const UnionMember *largestMember() const {
@@ -4622,7 +4622,7 @@ void CheckOtherImpl::unionZeroInitError(const Token *tok,
                 "Zero initializing union '$symbol' does not guarantee " +
                 "its complete storage to be zero initialized as its largest member " +
                 "is not declared as the first member. Consider making " +
-                *largestMember.name + " the first member or favor memset().");
+                largestMember.name() + " the first member or favor memset().");
 }
 
 //-----------------------------------------------------------------------------

lib/checkersreport.h

@@ -22,7 +22,7 @@
 #include "errortypes.h"
 #include "library.h"
 #include "mathlib.h"
-#include "nonnullptr.h"
+#include "refthunk.h"
 #include "pathanalysis.h"
 #include "settings.h"
 #include "standards.h"
@@ -2876,7 +2876,7 @@ namespace {
     private:
         const Token* mBodyTok;
         const Token* mLoopVar{};
-        NonNullPtr<const Settings> mSettings;
+        RefThunk<const Settings> mSettings;
         std::set<nonneg int> mVarsChanged;
 
     public:
@@ -2899,7 +2899,7 @@ namespace {
             int n = 1 + (astIsPointer(tok) ? 1 : 0);
             for (int i = 0; i < n; i++) {
                 bool inconclusive = false;
-                if (isVariableChangedByFunctionCall(tok, i, mSettings->library, &inconclusive))
+                if (isVariableChangedByFunctionCall(tok, i, mSettings().library, &inconclusive))
                     return true;
                 if (inconclusive)
                     return true;

lib/checkother.cpp

@@ -20,7 +20,7 @@
 
 #include "errortypes.h"
 #include "mathlib.h"
-#include "nonnullptr.h"
+#include "refthunk.h"
 #include "standards.h"
 #include "symboldatabase.h"
 #include "token.h"
@@ -234,8 +234,8 @@ namespace clangimport {
             , mSymbolDatabase(symbolDatabase)
         {}
 
-        NonNullPtr<const Settings> mSettings;
-        NonNullPtr<SymbolDatabase> mSymbolDatabase;
+        RefThunk<const Settings> mSettings;
+        RefThunk<SymbolDatabase> mSymbolDatabase;
 
         int enumValue = 0;
 
@@ -644,7 +644,7 @@ const ::Type * clangimport::AstNode::addTypeTokens(TokenList &tokenList, const s
     for (const Token *typeToken = tokenList.back(); Token::Match(typeToken, "&|*|%name%"); typeToken = typeToken->previous()) {
         if (!typeToken->isName())
             continue;
-        const ::Type *recordType = scope->symdb->findVariableType(scope, typeToken);
+        const ::Type *recordType = scope->symdb().findVariableType(scope, typeToken);
         if (recordType) {
             const_cast<Token*>(typeToken)->type(recordType);
             return recordType;
@@ -673,7 +673,7 @@ void clangimport::AstNode::addFullScopeNameTokens(TokenList &tokenList, const Sc
 const Scope *clangimport::AstNode::getNestedInScope(TokenList &tokenList)
 {
     if (!tokenList.back())
-        return &mData->mSymbolDatabase->scopeList.front();
+        return &mData->mSymbolDatabase().scopeList.front();
     if (tokenList.back()->str() == "}" && mData->mNotScope.find(tokenList.back()) == mData->mNotScope.end())
         return tokenList.back()->scope()->nestedIn;
     return tokenList.back()->scope();
@@ -1072,8 +1072,8 @@ Token *clangimport::AstNode::createTokens(TokenList &tokenList)
             const_cast<Token *>(enumscope->bodyEnd)->deletePrevious();
 
         // Create enum type
-        mData->mSymbolDatabase->typeList.emplace_back(enumtok, enumscope, enumtok->scope());
-        enumscope->definedType = &mData->mSymbolDatabase->typeList.back();
+        mData->mSymbolDatabase().typeList.emplace_back(enumtok, enumscope, enumtok->scope());
+        enumscope->definedType = &mData->mSymbolDatabase().typeList.back();
         if (nametok)
             const_cast<Scope *>(enumtok->scope())->definedTypesMap[nametok->str()] = enumscope->definedType;
 
@@ -1239,8 +1239,8 @@ Token *clangimport::AstNode::createTokens(TokenList &tokenList)
         }
 
         Scope *recordScope = createScope(tokenList, ScopeType::eStruct, children, classDef);
-        mData->mSymbolDatabase->typeList.emplace_back(classDef, recordScope, classDef->scope());
-        recordScope->definedType = &mData->mSymbolDatabase->typeList.back();
+        mData->mSymbolDatabase().typeList.emplace_back(classDef, recordScope, classDef->scope());
+        recordScope->definedType = &mData->mSymbolDatabase().typeList.back();
         if (!recordName.empty()) {
             recordScope->className = recordName;
             const_cast<Scope *>(classDef->scope())->definedTypesMap[recordName] = recordScope->definedType;
@@ -1521,8 +1521,8 @@ void clangimport::AstNode::createTokensForCXXRecord(TokenList &tokenList)
         const std::string addr = mExtTokens[0];
         mData->scopeDecl(addr, scope);
         scope->className = className;
-        mData->mSymbolDatabase->typeList.emplace_back(classToken, scope, classToken->scope());
-        scope->definedType = &mData->mSymbolDatabase->typeList.back();
+        mData->mSymbolDatabase().typeList.emplace_back(classToken, scope, classToken->scope());
+        scope->definedType = &mData->mSymbolDatabase().typeList.back();
         const_cast<Scope *>(classToken->scope())->definedTypesMap[className] = scope->definedType;
     }
     addtoken(tokenList, ";");

lib/checkstl.cpp

@@ -159,14 +159,14 @@
     <ClInclude Include="library.h" />
     <ClInclude Include="matchcompiler.h" />
     <ClInclude Include="mathlib.h" />
-    <ClInclude Include="nonnullptr.h" />
     <ClInclude Include="path.h" />
     <ClInclude Include="pathanalysis.h" />
     <ClInclude Include="pathmatch.h" />
     <ClInclude Include="platform.h" />
     <ClInclude Include="precompiled.h" />
     <ClInclude Include="preprocessor.h" />
     <ClInclude Include="programmemory.h" />
+    <ClInclude Include="refthunk.h" />
     <ClInclude Include="regex.h" />
     <ClInclude Include="reverseanalyzer.h" />
     <ClInclude Include="rule.h" />