danmar · danmar · Jan 26, 2023 · Dec 13, 2022 · Dec 13, 2022 · Dec 13, 2022
diff --git a/Makefile b/Makefile
diff --git a/lib/astutils.cpp b/lib/astutils.cpp
@@ -31,6 +31,8 @@
 #include "utils.h"
 #include "valueflow.h"
 #include "valueptr.h"
+#include "vfvalue.h"
+
 #include "checkclass.h"
 
 #include <algorithm>

diff --git a/lib/check.cpp b/lib/check.cpp
@@ -24,7 +24,7 @@
 #include "settings.h"
 #include "token.h"
 #include "tokenize.h"
-#include "valueflow.h"
+#include "vfvalue.h"
 
 #include <cctype>
 #include <iostream>

diff --git a/lib/checkautovariables.cpp b/lib/checkautovariables.cpp
@@ -29,6 +29,7 @@
 #include "token.h"
 #include "tokenize.h"
 #include "valueflow.h"
+#include "vfvalue.h"
 
 #include <list>
 #include <unordered_set>

diff --git a/lib/checkbool.cpp b/lib/checkbool.cpp
@@ -26,7 +26,7 @@
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
-#include "valueflow.h"
+#include "vfvalue.h"
 
 #include <list>
 #include <vector>

diff --git a/lib/checkbufferoverrun.h b/lib/checkbufferoverrun.h
@@ -28,7 +28,7 @@
 #include "errortypes.h"
 #include "mathlib.h"
 #include "symboldatabase.h"
-#include "valueflow.h"
+#include "vfvalue.h"
 
 #include <list>
 #include <map>

diff --git a/lib/checkcondition.cpp b/lib/checkcondition.cpp
@@ -29,7 +29,7 @@
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
-#include "valueflow.h"
+#include "vfvalue.h"
 
 #include "checkother.h" // comparisonNonZeroExpressionLessThanZero and testIfNonZeroExpressionIsPositive
 

diff --git a/lib/checkfunctions.cpp b/lib/checkfunctions.cpp
@@ -29,6 +29,7 @@
 #include "token.h"
 #include "tokenize.h"
 #include "valueflow.h"
+#include "vfvalue.h"
 
 #include <iomanip>
 #include <sstream>

diff --git a/lib/checkio.cpp b/lib/checkio.cpp
@@ -25,7 +25,7 @@
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
-#include "valueflow.h"
+#include "vfvalue.h"
 
 #include <algorithm>
 #include <cctype>

diff --git a/lib/checknullpointer.cpp b/lib/checknullpointer.cpp
@@ -29,6 +29,7 @@
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
+#include "valueflow.h"
 
 #include <algorithm>
 #include <cctype>

diff --git a/lib/checknullpointer.h b/lib/checknullpointer.h
@@ -25,7 +25,7 @@
 #include "check.h"
 #include "config.h"
 #include "ctu.h"
-#include "valueflow.h"
+#include "vfvalue.h"
 
 #include <list>
 #include <string>

diff --git a/lib/checkother.cpp b/lib/checkother.cpp
@@ -31,6 +31,7 @@
 #include "tokenize.h"
 #include "utils.h"
 #include "valueflow.h"
+#include "vfvalue.h"
 
 #include "checkuninitvar.h" // CheckUninitVar::isVariableUsage
 #include "checkclass.h" // CheckClass::stl_containers_not_const

diff --git a/lib/checkstl.h b/lib/checkstl.h
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "errortypes.h"
 #include "tokenize.h"
-#include "valueflow.h"
+#include "vfvalue.h"
 
 #include <string>
 

diff --git a/lib/checktype.cpp b/lib/checktype.cpp
@@ -28,6 +28,7 @@
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
+#include "valueflow.h"
 
 #include <cmath>
 #include <list>

diff --git a/lib/checktype.h b/lib/checktype.h
@@ -24,7 +24,7 @@
 
 #include "check.h"
 #include "config.h"
-#include "valueflow.h"
+#include "vfvalue.h"
 
 #include <list>
 #include <string>

diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp
@@ -28,7 +28,6 @@
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
-#include "valueflow.h"
 
 #include "checknullpointer.h"   // CheckNullPointer::isPointerDeref
 

diff --git a/lib/checkuninitvar.h b/lib/checkuninitvar.h
@@ -27,7 +27,7 @@
 #include "ctu.h"
 #include "mathlib.h"
 #include "errortypes.h"
-#include "valueflow.h"
+#include "vfvalue.h"
 
 #include <list>
 #include <map>

diff --git a/lib/clangimport.cpp b/lib/clangimport.cpp
@@ -26,7 +26,7 @@
 #include "tokenize.h"
 #include "tokenlist.h"
 #include "utils.h"
-#include "valueflow.h"
+#include "vfvalue.h"
 
 #include <algorithm>
 #include <cctype>

diff --git a/lib/cppcheck.vcxproj b/lib/cppcheck.vcxproj
@@ -103,6 +103,7 @@
     <ClCompile Include="tokenlist.cpp" />
     <ClCompile Include="utils.cpp" />
     <ClCompile Include="valueflow.cpp" />
+    <ClCompile Include="vfvalue.cpp" />
   </ItemGroup>
   <ItemGroup Label="HeaderFiles">
     <ClInclude Include="..\externals\simplecpp\simplecpp.h" />
@@ -174,6 +175,7 @@
     <ClInclude Include="valueflow.h" />
     <ClInclude Include="valueptr.h" />
     <ClInclude Include="version.h" />
+    <ClInclude Include="vfvalue.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="version.rc" />

diff --git a/lib/cppcheck.vcxproj.filters b/lib/cppcheck.vcxproj.filters
@@ -191,6 +191,9 @@
     <ClCompile Include="infer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="vfvalue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup Label="HeaderFiles">
     <ClInclude Include="checkbufferoverrun.h">
@@ -400,6 +403,9 @@
     <ClInclude Include="valueptr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="vfvalue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="version.rc" />

diff --git a/lib/ctu.h b/lib/ctu.h
@@ -26,7 +26,7 @@
 #include "check.h"
 #include "errorlogger.h"
 #include "mathlib.h"
-#include "valueflow.h"
+#include "vfvalue.h"
 
 #include <list>
 #include <map>

diff --git a/lib/fwdanalysis.cpp b/lib/fwdanalysis.cpp
@@ -23,7 +23,7 @@
 #include "library.h"
 #include "symboldatabase.h"
 #include "token.h"
-#include "valueflow.h"
+#include "vfvalue.h"
 
 #include <string>
 

diff --git a/lib/infer.h b/lib/infer.h
@@ -21,7 +21,7 @@
 
 #include "config.h"
 #include "mathlib.h"
-#include "valueflow.h"
+#include "vfvalue.h"
 
 #include <list>
 #include <string>

diff --git a/lib/lib.pri b/lib/lib.pri
@@ -69,7 +69,8 @@ HEADERS += $${PWD}/analyzer.h \
            $${PWD}/utils.h \
            $${PWD}/valueflow.h \
            $${PWD}/valueptr.h \
-           $${PWD}/version.h
+           $${PWD}/version.h \
+           $${PWD}/vfvalue.h
 
 SOURCES += $${PWD}/analyzerinfo.cpp \
            $${PWD}/astutils.cpp \
@@ -128,4 +129,5 @@ SOURCES += $${PWD}/analyzerinfo.cpp \
            $${PWD}/tokenize.cpp \
            $${PWD}/tokenlist.cpp \
            $${PWD}/utils.cpp \
-           $${PWD}/valueflow.cpp
+           $${PWD}/valueflow.cpp \
+           $${PWD}/vfvalue.cpp
diff --git a/lib/library.cpp b/lib/library.cpp
@@ -26,6 +26,7 @@
 #include "tokenlist.h"
 #include "utils.h"
 #include "valueflow.h"
+#include "vfvalue.h"
 
 #include <cctype>
 #include <climits>

diff --git a/lib/pathanalysis.cpp b/lib/pathanalysis.cpp
@@ -21,7 +21,7 @@
 #include "astutils.h"
 #include "symboldatabase.h"
 #include "token.h"
-#include "valueflow.h"
+#include "vfvalue.h"
 
 #include <algorithm>
 #include <memory>

diff --git a/lib/programmemory.h b/lib/programmemory.h
@@ -21,7 +21,7 @@
 
 #include "config.h"
 #include "mathlib.h"
-#include "valueflow.h" // needed for alias
+#include "vfvalue.h" // needed for alias
 
 #include <cstddef>
 #include <functional>

diff --git a/lib/settings.cpp b/lib/settings.cpp
@@ -19,7 +19,7 @@
 #include "settings.h"
 #include "path.h"
 #include "summaries.h"
-#include "valueflow.h"
+#include "vfvalue.h"
 
 #include <fstream>
 

diff --git a/lib/token.cpp b/lib/token.cpp
@@ -45,6 +45,15 @@
 #include <unordered_set>
 #include <utility>
 
+namespace {
+    struct less {
+        template<class T, class U>
+        bool operator()(const T &x, const U &y) const {
+            return x < y;
+        }
+    };
+}
+
 const std::list<ValueFlow::Value> TokenImpl::mEmptyValueList;
 
 Token::Token(TokensFrontBack *tokensFrontBack) :
@@ -1921,7 +1930,7 @@ static bool removeContradiction(std::list<ValueFlow::Value>& values)
                 continue;
             if (!x.equalValue(y)) {
                 auto compare = [](const ValueFlow::Value& x, const ValueFlow::Value& y) {
-                    return x.compareValue(y, ValueFlow::less{});
+                    return x.compareValue(y, less{});
                 };
                 const ValueFlow::Value& maxValue = std::max(x, y, compare);
                 const ValueFlow::Value& minValue = std::min(x, y, compare);
@@ -2012,9 +2021,9 @@ static void mergeAdjacent(std::list<ValueFlow::Value>& values)
                 if (y->bound != ValueFlow::Value::Bound::Point)
                     continue;
             }
-            if (x->bound == ValueFlow::Value::Bound::Lower && !y->compareValue(*x, ValueFlow::less{}))
+            if (x->bound == ValueFlow::Value::Bound::Lower && !y->compareValue(*x, less{}))
                 continue;
-            if (x->bound == ValueFlow::Value::Bound::Upper && !x->compareValue(*y, ValueFlow::less{}))
+            if (x->bound == ValueFlow::Value::Bound::Upper && !x->compareValue(*y, less{}))
                 continue;
             adjValues.push_back(y);
         }
@@ -2025,7 +2034,7 @@ static void mergeAdjacent(std::list<ValueFlow::Value>& values)
         std::sort(adjValues.begin(), adjValues.end(), [&values](ValueIterator xx, ValueIterator yy) {
             (void)values;
             assert(xx != values.end() && yy != values.end());
-            return xx->compareValue(*yy, ValueFlow::less{});
+            return xx->compareValue(*yy, less{});
         });
         if (x->bound == ValueFlow::Value::Bound::Lower)
             x = removeAdjacentValues(values, x, adjValues.rbegin(), adjValues.rend());

diff --git a/lib/token.h b/lib/token.h
@@ -23,9 +23,9 @@
 
 #include "config.h"
 #include "mathlib.h"
-#include "valueflow.h"
 #include "templatesimplifier.h"
 #include "utils.h"
+#include "vfvalue.h"
 
 #include <cstdint>
 #include <cstddef>