ValueFlow: introduced cf/analyze.h to group all analyze headers / prefix extracted function with analyze / use ValueFlow namespace in split implementation

Author: firewave

Makefile

@@ -621,7 +621,7 @@ $(libcppdir)/tokenlist.o: lib/tokenlist.cpp externals/simplecpp/simplecpp.h lib/
 $(libcppdir)/utils.o: lib/utils.cpp lib/config.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/utils.cpp
 
-$(libcppdir)/valueflow.o: lib/valueflow.cpp lib/analyzer.h lib/astutils.h lib/calculate.h lib/check.h lib/checkuninitvar.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/forwardanalyzer.h lib/importproject.h lib/infer.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/programmemory.h lib/reverseanalyzer.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/valueptr.h lib/vf/enumvalue.h lib/vfvalue.h
+$(libcppdir)/valueflow.o: lib/valueflow.cpp lib/analyzer.h lib/astutils.h lib/calculate.h lib/check.h lib/checkuninitvar.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/forwardanalyzer.h lib/importproject.h lib/infer.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/programmemory.h lib/reverseanalyzer.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/valueptr.h lib/vf/analyze.h lib/vf/enumvalue.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/valueflow.cpp
 
 $(libcppdir)/vf/enumvalue.o: lib/vf/enumvalue.cpp lib/vf/enumvalue.h

lib/cppcheck.vcxproj

@@ -176,6 +176,7 @@
     <ClInclude Include="valueflow.h" />
     <ClInclude Include="valueptr.h" />
     <ClInclude Include="version.h" />
+    <ClInclude Include="vf/analyze.h" />
     <ClInclude Include="vf/enumvalue.h" />
     <ClInclude Include="vfvalue.h" />
   </ItemGroup>

lib/lib.pri

@@ -70,6 +70,7 @@ HEADERS += $${PWD}/analyzer.h \
            $${PWD}/valueflow.h \
            $${PWD}/valueptr.h \
            $${PWD}/version.h \
+           $${PWD}/vf/analyze.h \
            $${PWD}/vf/enumvalue.h \
            $${PWD}/vfvalue.h
 

lib/valueflow.cpp

@@ -102,7 +102,7 @@
 #include "valueptr.h"
 #include "vfvalue.h"
 
-#include "vf/enumvalue.h"
+#include "vf/analyze.h"
 
 #include <algorithm>
 #include <array>
@@ -8809,13 +8809,13 @@ void ValueFlow::setValues(TokenList *tokenlist, SymbolDatabase* symboldatabase,
     for (Token *tok = tokenlist->front(); tok; tok = tok->next())
         tok->clearValueFlow();
 
-    ValueFlow::enumValue(symboldatabase, settings);
+    ValueFlow::analyzeEnumValue(symboldatabase, settings);
     valueFlowNumber(tokenlist);
     valueFlowString(tokenlist);
     valueFlowArray(tokenlist);
     valueFlowUnknownFunctionReturn(tokenlist, settings);
     valueFlowGlobalConstVar(tokenlist, settings);
-    ValueFlow::enumValue(symboldatabase, settings);
+    ValueFlow::analyzeEnumValue(symboldatabase, settings);
     valueFlowNumber(tokenlist);
     valueFlowGlobalStaticVar(tokenlist, settings);
     valueFlowPointerAlias(tokenlist);

lib/vf/analyze.h

@@ -0,0 +1,24 @@
+/*
+ * Cppcheck - A tool for static C/C++ code analysis
+ * Copyright (C) 2007-2023 Cppcheck team.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef vfAnalyzeeH
+#define vfAnalyzeeH
+
+#include "enumvalue.h"
+
+#endif // vfAnalyzeeH

lib/vf/enumvalue.cpp

@@ -23,7 +23,9 @@
 #include "token.h"
 #include "valueflow.h"
 
-void ValueFlow::enumValue(SymbolDatabase * symboldatabase, const Settings * settings)
+using namespace ValueFlow;
+
+void ValueFlow::analyzeEnumValue(SymbolDatabase * symboldatabase, const Settings * settings)
 {
     for (Scope & scope : symboldatabase->scopeList) {
         if (scope.type != Scope::eEnum)
@@ -34,7 +36,7 @@ void ValueFlow::enumValue(SymbolDatabase * symboldatabase, const Settings * sett
         for (Enumerator & enumerator : scope.enumeratorList) {
             if (enumerator.start) {
                 Token *rhs = enumerator.start->previous()->astOperand2();
-                ValueFlow::valueFlowConstantFoldAST(rhs, settings);
+                valueFlowConstantFoldAST(rhs, settings);
                 if (rhs && rhs->hasKnownIntValue()) {
                     enumerator.value = rhs->values().front().intvalue;
                     enumerator.value_known = true;

lib/vf/enumvalue.h

@@ -24,7 +24,7 @@ class Settings;
 
 namespace ValueFlow
 {
-    void enumValue(SymbolDatabase * symboldatabase, const Settings * settings);
+    void analyzeEnumValue(SymbolDatabase * symboldatabase, const Settings * settings);
 }
 
 #endif // vfEnumValueH

tools/dmake.cpp

@@ -318,6 +318,7 @@ int main(int argc, char **argv)
     libfiles_h.emplace_back("tokenrange.h");
     libfiles_h.emplace_back("valueptr.h");
     libfiles_h.emplace_back("version.h");
+    libfiles_h.emplace_back("vf/analyze.h");
     std::sort(libfiles_h.begin(), libfiles_h.end());
 
     std::vector<std::string> clifiles_h;